modularized: gitgrep, lustyjuggler, greplace

.gitmodules

@@ -55,3 +55,12 @@
 [submodule "vim/bundle/vim-scripts-bufexplorer.zip"]
 	path = vim/bundle/vim-scripts-bufexplorer.zip
 	url = https://github.com/vim-scripts/bufexplorer.zip.git
+[submodule "vim/bundle/sjbach-lusty"]
+	path = vim/bundle/sjbach-lusty
+	url = https://github.com/sjbach/lusty.git
+[submodule "vim/bundle/tjennings-git-grep-vim"]
+	path = vim/bundle/tjennings-git-grep-vim
+	url = https://github.com/tjennings/git-grep-vim
+[submodule "vim/bundle/skwp-greplace"]
+	path = vim/bundle/skwp-greplace
+	url = https://github.com/skwp/greplace.vim

README.md

@@ -141,9 +141,8 @@ Included vim plugins
  * NERDTree - everyone's favorite tree browser
  * NERDTree-tabs - makes NERDTree play nice with MacVim tabs so that it's on every tab
  * ShowMarks - creates a visual gutter to the left of the number column showing you your marks (saved locations). use \mt to toggle it, \mm to place the next available mark, \mh to delete, \ma to clear all. Use standard vim mark navigation ('X) for mark named X.
- * EasyMotion - hit ,, (forward) or z,, (back) and watch the magic happen. just type the letters and jump directly to your target
+ * EasyMotion - hit ,, (forward) or z,, (back) and watch the magic happen. just type the letters and jump directly to your target - in the provided vimrc the keys are optimized for home and upper row, no pinkies
- * BufExplorer - access with 'B' - a big buffer window, good for when you want to search for a buffer
+ * LustyJuggler/Explorer - hit B, type buf name to match a buffer, or type S and use the home row keys to select a buffer
- * LustyJuggler - access with 'S' - a small buffer window at the bottom, each buffer is assigned to a home row key in order
 
  Git
 
@@ -163,6 +162,7 @@ Included vim plugins
 
  Utils
 
+ * greplace - use :Gsearch to find across many files, replace inside the changes, then :Greplace to do a replace across all matches
  * ConqueTerm - embedded fully colorful shell inside your vim
  * vim-ruby-conque - helpers to run ruby,rspec,rake within ConqueTerm - use \rr (ruby), \ss (rspec), \ll (rspec line), \RR (rake)
  * vim-markdown-preview - :Mm to view your README.md as html

vim/bundle/sjbach-lusty

@@ -0,0 +1 @@
+Subproject commit 6b59f0db14e76d14ce979648f7592abc7d7e0cb4

vim/bundle/skwp-greplace

@@ -0,0 +1 @@
+Subproject commit e7fb26ec95ecf97bfe4b99683b95cb37c654460a

vim/bundle/tjennings-git-grep-vim

@@ -0,0 +1 @@
+Subproject commit f340ec93f5071238823db6dcd2431c924fee4418

vim/plugin/color_sample_pack.vim

@@ -1,166 +0,0 @@
-" Vim default schemes
-amenu T&hemes.D&efault.Blue :colo blue<CR>
-amenu T&hemes.D&efault.DarkBlue :colo darkblue<CR>
-amenu T&hemes.D&efault.Default :colo default<CR>
-amenu T&hemes.D&efault.Delek :colo delek<CR>
-amenu T&hemes.D&efault.Desert :colo desert<CR>
-amenu T&hemes.D&efault.ElfLord :colo elflord<CR>
-amenu T&hemes.D&efault.Evening :colo evening<CR>
-amenu T&hemes.D&efault.Koehler :colo koehler<CR>
-amenu T&hemes.D&efault.Morning :colo morning<CR>
-amenu T&hemes.D&efault.Murphy :colo murphy<CR>
-amenu T&hemes.D&efault.Pablo :colo pablo<CR>
-amenu T&hemes.D&efault.PeachPuff :colo peachpuff<CR>
-amenu T&hemes.D&efault.Ron :colo ron<CR>
-amenu T&hemes.D&efault.Shine :colo shine<CR>
-amenu T&hemes.D&efault.Torte :colo torte<CR>
-
-" Recommended Themes
-amenu T&hemes.&Recommendations.InkPot :colo inkpot<CR>
-amenu T&hemes.&Recommendations.MetaCosm :colo metacosm<CR>
-amenu T&hemes.&Recommendations.MidNight2 :colo midnight2<CR>
-amenu T&hemes.&Recommendations.PS_Warm :let psc_style='warm'<CR>:colo ps_color<CR>
-
-amenu T&hemes.-s1- :
-
-"submenu black
-amenu T&hemes.black.brookstream  :colo brookstream<CR>
-amenu T&hemes.black.candy  :colo candy<CR>
-amenu T&hemes.black.colorer  :colo colorer<CR>
-amenu T&hemes.black.dante  :colo dante<CR>
-amenu T&hemes.black.darkocean  :colo darkocean<CR>
-amenu T&hemes.black.dw_blue  :colo dw_blue<CR>
-amenu T&hemes.black.dw_cyan  :colo dw_cyan<CR>
-amenu T&hemes.black.dw_green  :colo dw_green<CR>
-amenu T&hemes.black.dw_orange  :colo dw_orange<CR>
-amenu T&hemes.black.dw_purple  :colo dw_purple<CR>
-amenu T&hemes.black.dw_red  :colo dw_red<CR>
-amenu T&hemes.black.dw_yellow  :colo dw_yellow<CR>
-amenu T&hemes.black.elflord  :colo elflord<CR>
-amenu T&hemes.black.fnaqevan  :colo fnaqevan<CR>
-amenu T&hemes.black.golden  :colo golden<CR>
-amenu T&hemes.black.*inkpot  :colo inkpot<CR>
-amenu T&hemes.black.koehler  :colo koehler<CR>
-amenu T&hemes.black.less  :colo less<CR>
-amenu T&hemes.black.manxome  :colo manxome<CR>
-amenu T&hemes.black.matrix  :colo matrix<CR>
-amenu T&hemes.black.metacosm  :colo metacosm<CR>
-amenu T&hemes.black.*motus  :colo motus<CR>
-amenu T&hemes.black.murphy  :colo murphy<CR>
-amenu T&hemes.black.neverness  :colo neverness<CR>
-amenu T&hemes.black.nightwish  :colo nightwish<CR>
-amenu T&hemes.black.oceanblack  :colo oceanblack<CR>
-amenu T&hemes.black.pablo  :colo pablo<CR>
-amenu T&hemes.black.*ps_color  :colo ps_color<CR>
-amenu T&hemes.black.relaxedgreen  :colo relaxedgreen<CR>
-amenu T&hemes.black.ron  :colo ron<CR>
-amenu T&hemes.black.tango  :colo tango<CR>
-amenu T&hemes.black.*torte  :colo torte<CR>
-amenu T&hemes.black.vibrantink  :colo vibrantink<CR>
-amenu T&hemes.black.*vividchalk  :colo vividchalk<CR>
-
-"submenu blue
-amenu T&hemes.blue.astronaut  :colo astronaut<CR>
-amenu T&hemes.blue.asu1dark  :colo asu1dark<CR>
-amenu T&hemes.blue.blue  :colo blue<CR>
-amenu T&hemes.blue.bluegreen  :colo bluegreen<CR>
-amenu T&hemes.blue.borland  :colo borland<CR>
-amenu T&hemes.blue.breeze  :colo breeze<CR>
-amenu T&hemes.blue.darkblue  :colo darkblue<CR>
-amenu T&hemes.blue.darkblue2  :colo darkblue2<CR>
-amenu T&hemes.blue.denim  :colo denim<CR>
-amenu T&hemes.blue.desertedocean  :colo desertedocean<CR>
-amenu T&hemes.blue.dusk  :colo dusk<CR>
-amenu T&hemes.blue.hhazure  :colo hhazure<CR>
-amenu T&hemes.blue.midnight  :colo midnight<CR>
-amenu T&hemes.blue.midnight2  :colo midnight2<CR>
-amenu T&hemes.blue.navajo-night  :colo navajo-night<CR>
-amenu T&hemes.blue.oceandeep  :colo oceandeep<CR>
-amenu T&hemes.blue.sea  :colo sea<CR>
-amenu T&hemes.blue.softblue  :colo softblue<CR>
-
-"submenu cyan
-amenu T&hemes.cyan.darkslategray  :colo darkslategray<CR>
-amenu T&hemes.cyan.marklar  :colo marklar<CR>
-
-"submenu darkgrey
-amenu T&hemes.darkgrey.candycode  :colo candycode<CR>
-amenu T&hemes.darkgrey.darktango  :colo darktango<CR>
-amenu T&hemes.darkgrey.hhspring  :colo hhspring<CR>
-amenu T&hemes.darkgrey.hhteal  :colo hhteal<CR>
-amenu T&hemes.darkgrey.hhviolet  :colo hhviolet<CR>
-amenu T&hemes.darkgrey.lettuce  :colo lettuce<CR>
-amenu T&hemes.darkgrey.night  :colo night<CR>
-amenu T&hemes.darkgrey.rdark  :colo rdark<CR>
-
-"submenu green
-amenu T&hemes.green.*tabula  :colo tabula<CR>
-
-"submenu grey
-amenu T&hemes.grey.biogoo  :colo biogoo<CR>
-amenu T&hemes.grey.camo  :colo camo<CR>
-amenu T&hemes.grey.*dawn  :colo dawn<CR>
-amenu T&hemes.grey.desert  :colo desert<CR>
-amenu T&hemes.grey.desertEx  :colo desertEx<CR>
-amenu T&hemes.grey.evening  :colo evening<CR>
-amenu T&hemes.grey.fog  :colo fog<CR>
-amenu T&hemes.grey.freya  :colo freya<CR>
-amenu T&hemes.grey.neon  :colo neon<CR>
-amenu T&hemes.grey.slate  :colo slate<CR>
-amenu T&hemes.grey.umber-green  :colo umber-green<CR>
-amenu T&hemes.grey.xemacs  :colo xemacs<CR>
-amenu T&hemes.grey.*zenburn  :colo zenburn<CR>
-
-"submenu magenta
-amenu T&hemes.magenta.lilac  :colo lilac<CR>
-
-"submenu offwhite
-amenu T&hemes.offwhite.autumn  :colo autumn<CR>
-amenu T&hemes.offwhite.autumnleaf  :colo autumnleaf<CR>
-amenu T&hemes.offwhite.*baycomb  :colo baycomb<CR>
-amenu T&hemes.offwhite.fine_blue  :colo fine_blue<CR>
-amenu T&hemes.offwhite.fruit  :colo fruit<CR>
-amenu T&hemes.offwhite.habiLight  :colo habiLight<CR>
-amenu T&hemes.offwhite.ironman  :colo ironman<CR>
-amenu T&hemes.offwhite.morning  :colo morning<CR>
-amenu T&hemes.offwhite.nuvola  :colo nuvola<CR>
-amenu T&hemes.offwhite.oceanlight  :colo oceanlight<CR>
-amenu T&hemes.offwhite.pyte  :colo pyte<CR>
-amenu T&hemes.offwhite.simpleandfriendly  :colo simpleandfriendly<CR>
-
-"submenu red
-amenu T&hemes.red.ChocolateLiquor  :colo ChocolateLiquor<CR>
-amenu T&hemes.red.hhpink  :colo hhpink<CR>
-amenu T&hemes.red.*navajo  :colo navajo<CR>
-amenu T&hemes.red.peachpuff  :colo peachpuff<CR>
-amenu T&hemes.red.tomatosoup  :colo tomatosoup<CR>
-
-"submenu unknown
-amenu T&hemes.unknown.bw  :colo bw<CR>
-amenu T&hemes.unknown.calmar256-light  :colo calmar256-light<CR>
-amenu T&hemes.unknown.chela_light  :colo chela_light<CR>
-amenu T&hemes.unknown.colorscheme_template  :colo colorscheme_template<CR>
-amenu T&hemes.unknown.default  :colo default<CR>
-amenu T&hemes.unknown.desert256  :colo desert256<CR>
-amenu T&hemes.unknown.impact  :colo impact<CR>
-amenu T&hemes.unknown.psql  :colo psql<CR>
-amenu T&hemes.unknown.vc  :colo vc<CR>
-
-"submenu white
-amenu T&hemes.white.delek  :colo delek<CR>
-amenu T&hemes.white.eclipse  :colo eclipse<CR>
-amenu T&hemes.white.martin_krischik  :colo martin_krischik<CR>
-amenu T&hemes.white.*moria  :colo moria<CR>
-amenu T&hemes.white.print_bw  :colo print_bw<CR>
-amenu T&hemes.white.shine  :colo shine<CR>
-amenu T&hemes.white.*sienna  :colo sienna<CR>
-amenu T&hemes.white.tolerable  :colo tolerable<CR>
-amenu T&hemes.white.zellner  :colo zellner<CR>
-
-"submenu yellow
-amenu T&hemes.yellow.PapayaWhip  :colo PapayaWhip<CR>
-amenu T&hemes.yellow.buttercream  :colo buttercream<CR>
-amenu T&hemes.yellow.hhorange  :colo hhorange<CR>
-amenu T&hemes.yellow.olive  :colo olive<CR>
-amenu T&hemes.yellow.professional  :colo professional<CR>
-amenu T&hemes.yellow.robinhood  :colo robinhood<CR>

vim/plugin/git-grep.vim

@@ -1,42 +0,0 @@
-let g:gitgrepprg="git\\ grep\\ -n"
-
-function! GitGrep(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:gitgrepprg
-    execute "silent! grep " . a:args
-    botright copen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-function! GitGrepAdd(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:gitgrepprg
-    execute "silent! grepadd " . a:args
-    botright copen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-function! LGitGrep(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:gitgrepprg
-    execute "silent! lgrep " . a:args
-    botright lopen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-function! LGitGrepAdd(args)
-    let grepprg_bak=&grepprg
-    exec "set grepprg=" . g:gitgrepprg
-    execute "silent! lgrepadd " . a:args
-    botright lopen
-    let &grepprg=grepprg_bak
-    exec "redraw!"
-endfunction
-
-command! -nargs=* -complete=file GitGrep call GitGrep(<q-args>)
-command! -nargs=* -complete=file GitGrepAdd call GitGrepAdd(<q-args>)
-command! -nargs=* -complete=file LGitGrep call LGitGrep(<q-args>)
-command! -nargs=* -complete=file LGitGrepAdd call LGitGrepAdd(<q-args>)

vimrc

@@ -230,11 +230,6 @@ set viminfo='100,f1
 " this uses ctags. the standard way to get this is Ctrl-]
 nnoremap <silent> F <C-]>
 
-"open buf explorer with B
-map B <Leader>bv
-let g:bufExplorerShowRelativePath=1  " Show relative paths.
-let g:bufExplorerDefaultHelp=0
-
 "toggle between last two buffers with Z (normally ctrl-shift-6)
 nnoremap <silent> Z <C-^>
 
@@ -368,11 +363,11 @@ nmap <silent> gcp <c-_>p
 
 " LustyJuggler 
 " ========================================
-" User LustyJuggler buffer switcher by hitting S
+" better triggers for buffer switching
-" and then using the homerow keys to select the file
+" B to use the juggler, S to search the buffers
-" double tap the home row key to go to the file or hit
+nmap <silent> B \lj
-" once to just select it in the juggler
+nmap <silent> S \lb
-nmap <silent> S \lj
+
 let g:LustyJugglerSuppressRubyWarning = 1
 let g:LustyJugglerAltTabMode = 1
 " Colors to make LustyJuggler more usable
@@ -398,7 +393,7 @@ hi! EasyMotionTarget guifg=yellow
 " but it'll all be isolated to one area of the keyboard
 call EasyMotion#InitOptions({
 \   'leader_key'      : '<Leader><Leader>'
-\ , 'keys'            : 'asdfwejkliogh'
+\ , 'keys'            : 'fjdkslewio'
 \ , 'do_shade'        : 1
 \ , 'do_mapping'      : 1
 \ , 'grouping'        : 1