vim: prefer other signs over gitgutter

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 38e050a63778f30943c94a34083b50040efc6daf..82617e8123148666edea5c390b185881ad42cfe2 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'
@@ -760,9 +765,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