diff --git a/Brewfile.lock.json b/Brewfile.lock.json new file mode 100644 index 0000000..3849591 --- /dev/null +++ b/Brewfile.lock.json @@ -0,0 +1,57 @@ +{ + "entries": { + "tap": { + "thoughtbot/formulae": { + "revision": "a6bb452f4c03204fc49556c81e64172700a6d6d1" + } + }, + "brew": { + "rcm": { + "version": "1.3.4", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/rcm/blobs/sha256:a43a7792728bc4c441e997bc6e0879aecc237d1c95c7a47ff49093e33ad14979", + "sha256": "a43a7792728bc4c441e997bc6e0879aecc237d1c95c7a47ff49093e33ad14979" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/rcm/blobs/sha256:1ae14043eb53ab02db26a3bf33d15d817a09917788f0165bbcc538f77a9d38fd", + "sha256": "1ae14043eb53ab02db26a3bf33d15d817a09917788f0165bbcc538f77a9d38fd" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/rcm/blobs/sha256:86ac10a7254567afb24c9816f6a80dd90a81bc8cd8619c112e59c0950929ef14", + "sha256": "86ac10a7254567afb24c9816f6a80dd90a81bc8cd8619c112e59c0950929ef14" + }, + "mojave": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/rcm/blobs/sha256:44c9524d9d5ce8ea5310fe6681b040d6c685cec693446f617686f82929d83c6b", + "sha256": "44c9524d9d5ce8ea5310fe6681b040d6c685cec693446f617686f82929d83c6b" + }, + "high_sierra": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/rcm/blobs/sha256:7130060f9a26eda6a704eb06bda4c04a4cc0b0980f1c9d3fc5dce876fa5a3fdf", + "sha256": "7130060f9a26eda6a704eb06bda4c04a4cc0b0980f1c9d3fc5dce876fa5a3fdf" + } + } + } + } + } + }, + "system": { + "macos": { + "big_sur": { + "HOMEBREW_VERSION": "3.2.0", + "HOMEBREW_PREFIX": "/usr/local", + "Homebrew/homebrew-core": "86aed25937a7973d438e4ff159384b6a3fcfdf45", + "CLT": "12.5.0.0.1.1617976050", + "Xcode": "12.5", + "macOS": "11.3.1" + } + } + } +} diff --git a/vimrc b/vimrc index 4be9cb5..49ef31f 100644 --- a/vimrc +++ b/vimrc @@ -70,8 +70,9 @@ if count(g:vimified_packages, 'general') Plugin 'ctrlpvim/ctrlp.vim' let g:ctrlp_match_window = 'bottom,order:ttb,min:1,max:10,results:10' - let g:ctrlp_clear_cache_on_exit = 0 + " let g:ctrlp_clear_cache_on_exit = 0 let g:ctrlp_max_files = 0 + " let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git' nnoremap f :CtrlP noremap b :CtrlPBuffer @@ -82,16 +83,18 @@ if count(g:vimified_packages, 'general') if executable('rg') " Use Ripgrep over Grep set grepprg=rg\ --vimgrep\ --no-heading - set grepformat=%f:%l:%c:%m,%f:%l:%m + " set grepformat=%f:%l:%c:%m,%f:%l:%m - let g:ctrlp_user_command = 'rg --hidden -i --files %s' - let g:ackprg = 'rg --vimgrep' + " :echom "RG found" + let g:ctrlp_user_command = 'rg --hidden -g \!.git -g \!tags -g \!sorbet -g \!node_modules --files %s' + let g:ctrlp_use_caching = 0 + let g:ackprg = 'rg --vimgrep -g \!tags -g \!sorbet -g \!node_modules' elseif executable('ag') " Use Ag over Grep set grepprg=ag\ --nogroup\ --nocolor - let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --ignore ".git" --ignore ".DS_Store" --hidden -g ""' - let g:ackprg = 'ag --vimgrep' + let g:ctrlp_user_command = 'ag %s -i --nocolor --nogroup --ignore ".git" --ignore ".DS_Store" --ignore "node_modules" --hidden -g ""' + let g:ackprg = 'ag --vimgrep --ignore "tags" --ignore "sorbet" --ignore "node_modules"' else nnoremap F :ClearCtrlPCache\|:CtrlP endif @@ -113,18 +116,6 @@ if count(g:vimified_packages, 'general') map a :call AgGrep() vmap a :call AgVisual() - " File Renaming (credit: garybernhardt) - function! RenameFile() - let old_name = expand('%') - let new_name = input('New file name: ', expand('%'), 'file') - if new_name != '' && new_name != old_name - exec ':saveas ' . new_name - exec ':silent !rm ' . old_name - redraw! - endif - endfunction - map n :call RenameFile() - " Smart Tab completion (credit: garybernhardt) function! InsertTabWrapper() let col = col('.') - 1 @@ -663,7 +654,8 @@ else endif set showtabline=2 " always show tab bar -set showmatch " show matching brackets +set noshowmatch " DO NOT show matching brackets +let loaded_matchparen = 1 set hidden " allow hidden, unsaved buffers set splitbelow " add new window towards right set splitright " add new window towards bottom