diff --git a/README.md b/README.md index bcc172b7..5a31485c 100644 --- a/README.md +++ b/README.md @@ -186,7 +186,7 @@ of plugins above to learn more. * `,F` - same as `,f` but in a vertical split * `,gf` or `Ctrl-f` - same as vim normal gf (go to file), but in a vertical split (works with file.rb:123 line numbers also) * `gF` - standard vim mapping, here for completeness (go to file at line number) - * `K` - Search the current word under the cursor and show results in quickfix window + * `,k` - Search the current word under the cursor and show results in quickfix window * `,K` - Grep the current word up to next exclamation point (useful for ruby foo! methods) * `Cmd-*` - highlight all occurrences of current word (similar to regular `*` except doesn't move) * `,hl` - toggle search highlight on and off @@ -200,7 +200,7 @@ of plugins above to learn more. * `gK` - Opens the documentation for the word under the cursor. * Spacebar - Sneak - type two characters to move there in a line. Kind of like vim's `f` but more accurate. * `:Gsearch foo` - global search, then do your normal `%s/search/replace/g` and follow up with `:Greplace` to replace across all files. When done use `:wall` to write all the files. - + #### File Navigation diff --git a/vim/settings/search.vim b/vim/settings/search.vim index 501d70de..4be724e2 100644 --- a/vim/settings/search.vim +++ b/vim/settings/search.vim @@ -10,11 +10,11 @@ function! GetVisual() return selection endfunction -"grep the current word using K (mnemonic Kurrent) -nnoremap K :Rg +"grep the current word using ,k (mnemonic Kurrent) +nnoremap ,k :Rg "grep visual selection -vnoremap K :execute "Rg " . GetVisual() +vnoremap ,k :execute "Rg " . GetVisual() "grep current word up to the next exclamation point using ,K nnoremap ,K viwf!:execute "Rg " . GetVisual() @@ -27,4 +27,4 @@ nnoremap ,gd :Rg 'def ' nnoremap ,gg :Rg "" "Grep for usages of the current file -nnoremap ,gcf :exec "Rg " . expand("%:t:r") +nnoremap ,gcf :exec "Rg " . expand("%:t:r") \ No newline at end of file diff --git a/vim/vundles/languages.vundle b/vim/vundles/languages.vundle index 729d32ae..366b28de 100644 --- a/vim/vundles/languages.vundle +++ b/vim/vundles/languages.vundle @@ -5,3 +5,5 @@ Bundle 'jtratner/vim-flavored-markdown.git' Bundle 'scrooloose/syntastic.git' Bundle 'nelstrom/vim-markdown-preview' Bundle 'skwp/vim-html-escape' +Bundle 'mxw/vim-jsx' +Bundle 'jparise/vim-graphql' diff --git a/vim/vundles/project.vundle b/vim/vundles/project.vundle index 308fe05e..d18e021f 100644 --- a/vim/vundles/project.vundle +++ b/vim/vundles/project.vundle @@ -2,5 +2,6 @@ Bundle "jistr/vim-nerdtree-tabs.git" Bundle "scrooloose/nerdtree.git" Bundle "ctrlpvim/ctrlp.vim" Bundle 'JazzCore/ctrlp-cmatcher' +Bundle 'junegunn/fzf' Bundle "xolox/vim-misc" Bundle "xolox/vim-session"