X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/503760d8842c55997e2072180f237a2419f30939..0716bcc1f67f9f8caebc6788454cd4171a08414b:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 534116d..5baddd8 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'
@@ -73,13 +78,6 @@ Plug 'kana/vim-operator-user'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plug 'dense-analysis/ale' " {{{2
 let g:ale_echo_msg_format = '[%linter%] %code: %%s'
-let g:ale_c_parse_compile_commands = 1
-let g:ale_cpp_parse_compile_commands = 1
-" don't use loclist as it's being populated by ycm
-" (might want to enable for other filetypes)
-let g:ale_set_loclist = 0
-let g:ale_cpp_gcc_options = ''
-let g:ale_linters_ignore = { 'cpp': ['clangd', 'clangtidy', 'clang'] }
 
 Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
 Plug 'vim-scripts/syntaxrange'
@@ -98,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
@@ -569,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>
 
@@ -708,7 +716,7 @@ if executable('ag')
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::<CR>
 nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:<CR>
-command! -nargs=1 Ag Unite grep:.::<args>
+command! -nargs=+ Ag Unite -input=<args> grep:.:
 
 " unite-file_rec {{{3
 if executable('ag')
@@ -767,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