ranger: add preview for zip files

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 82617e8123148666edea5c390b185881ad42cfe2..5baddd8823ca11813c3cebad684796a889a496ec 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -96,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
@@ -567,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>
 
@@ -706,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')