From e7a9181998a1b1428fc635e5c4a7e88871879bdd Mon Sep 17 00:00:00 2001
From: Karl Mutch <karlmutch@gmail.com>
Date: Mon, 8 Feb 2021 13:31:11 -0800
Subject: [PATCH] Allow branch main to be used in submodules, add ripgrep
 defaults file

---
 .gitmodules       | 1 +
 README.md         | 2 +-
 install.conf.yaml | 1 +
 ripgreprc         | 8 ++++++++
 zshrc             | 2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 ripgreprc

diff --git a/.gitmodules b/.gitmodules
index 1dfccd2..bf6472d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -172,6 +172,7 @@
 [submodule "vim/bundle/splitjoin.vim"]
 	path = vim/bundle/splitjoin.vim
 	url = https://github.com/AndrewRadev/splitjoin.vim
+	branch = main
 [submodule "vim/bundle/Dockerfile.vim"]
 	path = vim/bundle/Dockerfile.vim
 	url = https://github.com/ekalinin/Dockerfile.vim.git
diff --git a/README.md b/README.md
index 8b03620..221f289 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Within vim use :GoInstallBinaries to load the tooling for the vim-go package fro
 
 Updating the referenced open source can be done using the following command:
 
-```git submodule foreach git pull origin master```
+```git submodule update --init --recursive --remote```
 
 Font management can be a little complex, here are some commands that might help:
 
diff --git a/install.conf.yaml b/install.conf.yaml
index 37f5506..365862f 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -15,6 +15,7 @@
 
 - link:
     ~/.tmux.conf:   tmux.conf
+    ~/.ripgreprc:   ripgreprc
     ~/.psqlrc:      psqlrc
     ~/.grc:         grc
     ~/.fzf:         fzf
diff --git a/ripgreprc b/ripgreprc
new file mode 100644
index 0000000..1e94d35
--- /dev/null
+++ b/ripgreprc
@@ -0,0 +1,8 @@
+# Using glob patterns to include/exclude files or folders
+--glob=!git/*
+--glob=!vendor/*
+--glob=!examples/aws/aws/dist/*
+
+# Don't let ripgrep vomit really long lines to my terminal, and show a preview.
+--max-columns=150
+--max-columns-preview
diff --git a/zshrc b/zshrc
index cb4ef1b..f01c5c0 100644
--- a/zshrc
+++ b/zshrc
@@ -160,6 +160,8 @@ export MANPATH="/usr/local/man:$MANPATH:$HOME/man"
 
 export PATH="$HOME/.arkade/bin/:$HOME/.pyenv/bin:${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
 
+export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
+
 rehash
 
 zstyle ':completion:*' rehash true