diff --git a/nvim/.config/nvim/after/plugin/gitgutter.vim b/nvim/.config/nvim/after/plugin/gitgutter.vim deleted file mode 100644 index 14897fc..0000000 --- a/nvim/.config/nvim/after/plugin/gitgutter.vim +++ /dev/null @@ -1,11 +0,0 @@ -nnoremap ]c :GitGutterNextHunk -nnoremap [c :GitGutterPrevHunk -nnoremap ghs :GitGutterStageHunk -nnoremap ghu :GitGutterUndoHunk -nnoremap ghp :GitGutterPreviewHunk -nnoremap ghq :GitGutterQuickFix -nnoremap ghf :GitGutterFold -omap ih (GitGutterTextObjectInnerPending) -omap ah (GitGutterTextObjectOuterPending) -xmap ih (GitGutterTextObjectInnerVisual) -xmap ah (GitGutterTextObjectOuterVisual) diff --git a/nvim/.config/nvim/after/plugin/signify.vim b/nvim/.config/nvim/after/plugin/signify.vim new file mode 100644 index 0000000..316da9b --- /dev/null +++ b/nvim/.config/nvim/after/plugin/signify.vim @@ -0,0 +1,10 @@ +nnoremap ghu :SignifyHunkUndo +nnoremap ghp :SignifyHunkDiff +nmap ]c (signify-next-hunk) +nmap [c (signify-prev-hunk) +nmap ]C 9999]c +nmap [C 9999[c +omap ih (signify-motion-inner-pending) +xmap ih (signify-motion-inner-visual) +omap ah (signify-motion-outer-pending) +xmap ah (signify-motion-outer-visual) diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index e9e496e..1f6c51e 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -20,7 +20,7 @@ Plug 'tmux-plugins/vim-tmux-focus-events' " Git support Plug 'rhysd/git-messenger.vim' Plug 'tpope/vim-fugitive' -Plug 'airblade/vim-gitgutter' +Plug 'mhinz/vim-signify' Plug 'rhysd/conflict-marker.vim' Plug 'whiteinge/diffconflicts' Plug 'salcode/vim-interactive-rebase-reverse' diff --git a/nvim/.config/nvim/plugin_settings.vim b/nvim/.config/nvim/plugin_settings.vim index 4c1ffbe..d8fa894 100644 --- a/nvim/.config/nvim/plugin_settings.vim +++ b/nvim/.config/nvim/plugin_settings.vim @@ -1,15 +1,3 @@ -" 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 let g:suda_smart_edit = 1