Skip to content

Commit

Permalink
Allow branch main to be used in submodules, add ripgrep defaults file
Browse files Browse the repository at this point in the history
  • Loading branch information
karlmutch committed Feb 8, 2021
1 parent a198d50 commit e7a9181
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
1 change: 1 addition & 0 deletions install.conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

- link:
~/.tmux.conf: tmux.conf
~/.ripgreprc: ripgreprc
~/.psqlrc: psqlrc
~/.grc: grc
~/.fzf: fzf
Expand Down
8 changes: 8 additions & 0 deletions ripgreprc
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e7a9181

Please sign in to comment.