Revert "nvim: Switch to signify"

See open issue
https://github.com/mhinz/vim-signify/issues/345

Makes signify completely unusable if the undo hunks feature is desired.

This reverts commit b25091fae6.
This commit is contained in:
Sanchayan Maity 2020-09-12 19:08:22 +05:30
parent af410754a4
commit 79be97c081
4 changed files with 24 additions and 11 deletions

View file

@ -0,0 +1,11 @@
nnoremap ]c :GitGutterNextHunk<CR>
nnoremap [c :GitGutterPrevHunk<CR>
nnoremap ghs :GitGutterStageHunk<CR>
nnoremap ghu :GitGutterUndoHunk<CR>
nnoremap ghp :GitGutterPreviewHunk<CR>
nnoremap ghq :GitGutterQuickFix<CR>
nnoremap ghf :GitGutterFold<CR>
omap ih <Plug>(GitGutterTextObjectInnerPending)
omap ah <Plug>(GitGutterTextObjectOuterPending)
xmap ih <Plug>(GitGutterTextObjectInnerVisual)
xmap ah <Plug>(GitGutterTextObjectOuterVisual)

View file

@ -1,10 +0,0 @@
nnoremap ghu :SignifyHunkUndo<CR>
nnoremap ghp :SignifyHunkDiff<CR>
nmap ]c <Plug>(signify-next-hunk)
nmap [c <Plug>(signify-prev-hunk)
nmap ]C 9999]c
nmap [C 9999[c
omap ih <Plug>(signify-motion-inner-pending)
xmap ih <Plug>(signify-motion-inner-visual)
omap ah <Plug>(signify-motion-outer-pending)
xmap ah <Plug>(signify-motion-outer-visual)

View file

@ -20,7 +20,7 @@ Plug 'tmux-plugins/vim-tmux-focus-events'
" Git support " Git support
Plug 'rhysd/git-messenger.vim' Plug 'rhysd/git-messenger.vim'
Plug 'tpope/vim-fugitive' Plug 'tpope/vim-fugitive'
Plug 'mhinz/vim-signify' Plug 'airblade/vim-gitgutter'
Plug 'rhysd/conflict-marker.vim' Plug 'rhysd/conflict-marker.vim'
Plug 'whiteinge/diffconflicts' Plug 'whiteinge/diffconflicts'
Plug 'salcode/vim-interactive-rebase-reverse' Plug 'salcode/vim-interactive-rebase-reverse'

View file

@ -1,3 +1,15 @@
" Let vim-gitgutter do its thing on large files
let g:gitgutter_max_signs=1000
let g:gitgutter_map_keys = 0
let g:gitgutter_highlight_linenrs = 1
let g:gitgutter_preview_win_floating = 1
let g:gitgutter_use_location_list = 0
let g:gitgutter_sign_added = '+a'
let g:gitgutter_sign_modified = '+m'
let g:gitgutter_sign_removed = '-r'
let g:gitgutter_sign_removed_first_line = '^^'
let g:gitgutter_sign_modified_removed = 'mr'
" suda vim " suda vim
let g:suda_smart_edit = 1 let g:suda_smart_edit = 1