vim: slightly better parsing of :Ag command

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 38e050a63778f30943c94a34083b50040efc6daf..5baddd8823ca11813c3cebad684796a889a496ec 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -18,7 +18,12 @@ call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 
-Plug 'airblade/vim-gitgutter'
+Plug 'airblade/vim-gitgutter' " {{{
+" prefer other signs such as ycm diags
+let g:gitgutter_sign_priority = 1
+" don't clobber other signs
+let g:gitgutter_sign_allow_clobber = 0
+"}}}
 Plug 'alepez/vim-gtest'
 Plug 'alx741/vinfo'
 Plug 'andrewradev/switch.vim'
@@ -91,6 +96,10 @@ let g:haskell_backpack = 1                " to enable highlighting of backpack k
 
 Plug 'aklt/plantuml-syntax'
 
+Plug 'mtth/scratch.vim'  " {{{2
+  let g:scratch_no_mappings = 1
+"}}}
+
 call plug#end()
 
 filetype plugin indent on
@@ -562,7 +571,13 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Git<CR>
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>
-nnoremap <silent> <leader>gc :tab G commit -v<CR>
+nnoremap <silent> <leader>gc :echohl WarningMsg \| echo "use \<leader>gcc instead" \| echohl None<CR> 
+nnoremap <silent> <leader>gcc :tab G commit -v<CR>
+nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
+nnoremap          <leader>gcf :tab G commit -v --fixup=
+nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR> 
+nnoremap <silent> <leader>gpp :G push<CR>
+nnoremap <silent> <leader>gpf :G push --force-with-lease<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :G blame<cr>
 
@@ -701,7 +716,7 @@ if executable('ag')
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
 nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
-command! -nargs=1 Ag Unite grep:.::<args>
+command! -nargs=+ Ag Unite -input=<args> grep:.:
 
 " unite-file_rec {{{3
 if executable('ag')
@@ -760,9 +775,11 @@ nmap ga <Plug>(EasyAlign)
 " vim-gtest {{{2
 let g:gtest#highlight_failing_tests = 0
 
-nnoremap <Leader>tt :GTestRun<CR>
-nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
-nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+nnoremap <silent> <Leader>tt :GTestRun<CR>
+nnoremap          <Leader>tc :GTestCase<space>
+nnoremap          <Leader>tn :GTestName<space>
+nnoremap <silent> <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
+nnoremap <silent> <Leader>tu :GTestRunUnderCursor<CR>
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0