X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/a975a3a64e3e421dbdf28aedf0a99f17c6b81753..5f3249a14dd8bc16ae764e581318a047f9876464:/vim/vimrc diff --git a/vim/vimrc b/vim/vimrc index 38e050a..b7188f1 100644 --- 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 @@ -760,9 +769,11 @@ nmap ga (EasyAlign) " vim-gtest {{{2 let g:gtest#highlight_failing_tests = 0 -nnoremap tt :GTestRun -nnoremap ta :GTestCase *:GTestName *:GTestRun -nnoremap tu :GTestRunUnderCursor +nnoremap tt :GTestRun +nnoremap tc :GTestCase +nnoremap tn :GTestName +nnoremap ta :GTestCase *:GTestName *:GTestRun +nnoremap tu :GTestRunUnderCursor " vim-json {{{2 let g:vim_json_syntax_conceal = 0