vim: don't duplicate plugins

Some existing vim plugins have a nvim replacement, let's not load them
in vimrc too. It can only cause issues.

diff --git a/vim/vimrc b/vim/vimrc
index 6bf709af7278a0f16d3227d39d729742be27821c..c1dc477536740dcf210c704017ecbc874d30da0e 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -61,7 +61,7 @@ if !has("nvim")
     let g:nord_cursor_line_number_background = 0
     let g:nord_bold_vertical_split_line = 0
   "}}}
     let g:nord_cursor_line_number_background = 0
     let g:nord_bold_vertical_split_line = 0
   "}}}

-  Plug 'sirver/ultisnips' " {{{2
+  Plug 'sirver/ultisnips' " replaced by lua-snip {{{2

   Plug 'honza/vim-snippets'
     let g:UltiSnipsEditSplit = 'vertical'
     let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]
   Plug 'honza/vim-snippets'
     let g:UltiSnipsEditSplit = 'vertical'
     let g:UltiSnipsSnippetDirectories = [ expand("$XDG_CONFIG_HOME/vim/ultisnips") ]


@@ -94,17 +94,113 @@ if !has("nvim")
     au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
     let g:UltiSnipsListSnippets="<c-e>"
   "}}}
     au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
     let g:UltiSnipsListSnippets="<c-e>"
   "}}}

-  Plug 'vim-utils/vim-man'  " {{{2
+  Plug 'vim-utils/vim-man'  " replaced by builtin {{{2

     let g:man_width = 80
   "}}}
     let g:man_width = 80
   "}}}

+  Plug 'airblade/vim-gitgutter' " replaced by gitsigns {{{
+  " 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 'justinmk/vim-sneak' " replaced by leap {{{2
+  let g:sneak#streak = 1
+  let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
+  let g:sneak#use_ic_scs = 1  " follow 'ignorecase' and 'smartcase'
+
+  " sneaky f and t
+  nmap f <Plug>Sneak_f
+  nmap F <Plug>Sneak_F
+  xmap f <Plug>Sneak_f
+  xmap F <Plug>Sneak_F
+  omap f <Plug>Sneak_f
+  omap F <Plug>Sneak_F
+  nmap t <Plug>Sneak_t
+  nmap T <Plug>Sneak_T
+  xmap t <Plug>Sneak_t
+  xmap T <Plug>Sneak_T
+  omap t <Plug>Sneak_t
+  omap T <Plug>Sneak_T
+  "}}}
+  Plug 'shougo/unite.vim' " replaced by telescope {{{2
+    function! UniteSetup()
+      call unite#filters#matcher_default#use(['matcher_fuzzy'])
+      call unite#custom#profile('default', 'context', {
+            \ 'winheight': 20,
+            \ 'direction': 'botright'
+            \ })
+
+      nnoremap [unite] <Nop>
+      nmap <leader>u [unite]
+      nnoremap [unite]u :UniteResume<CR>
+      nnoremap <silent> [u :UnitePrevious<CR>
+      nnoremap <silent> ]u :UniteNext<CR>
+
+      " unite-grep {{{3
+      " seems not respected
+      let g:unite_source_grep_max_candidates = 2000
+      if executable('ag')
+        " Use ag in unite grep source.
+        let g:unite_source_grep_command = 'ag'
+        let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+        let g:unite_source_grep_recursive_opt = ''
+      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=+ Ag Unite grep:.::<args>
+
+      " unite-file_rec {{{3
+      if executable('ag')
+        " Use ag in unite rec source
+        let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']
+      end
+      nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
+
+      " unite-buffer {{{3
+      call unite#custom#default_action('buffer', 'open')
+      nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
+
+      " unite-jumplist {{{3
+      nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<CR>
+
+      " unite-menu {{{3
+      let g:unite_source_menu_menus = {}
+      let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
+      let g:unite_source_menu_menus.fugitive.command_candidates = {
+            \ 'Gstatus <Leader>gs' : 'Gstatus',
+            \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
+            \ 'Glog' : 'Glog',
+            \}
+
+      nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
+
+      let g:unite_source_history_yank_enable = 1
+      nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
+    endfunction
+    augroup unit_setup
+      autocmd VimEnter * ++once call UniteSetup()
+    augroup END
+  "}}}2
+  Plug 'shougo/vimproc.vim', {'do': 'make'} " {{{2
+  "}}}2
+  Plug 'tomtom/tcomment_vim' " replaced by comment.nvim {{{2
+    let g:tcomment_textobject_inlinecomment = 'gic'
+    let g:tcomment#filetype#guess = 0
+    "let g:tcomment#options = {'whitespace' : 'no'}
+  "}}}2
+  " colorschemes
+  Plug 'morhetz/gruvbox' " {{{2
+    let g:gruvbox_contrast_dark  = 'hard'
+    let g:gruvbox_contrast_light = 'soft'
+  " }}}2
+  " staging
+  Plug 'puremourning/vimspector' " replaced by lsp {{{2
+    let g:vimspector_enable_mappings = 'HUMAN'
+  " }}}
+  Plug 'vim-scripts/syntaxrange' " replaced by treesitter {{{2
+  " }}}

 endif
 
 endif
 

-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/sideways.vim' " {{{2
 Plug 'alepez/vim-gtest'
 Plug 'alx741/vinfo'
 Plug 'andrewradev/sideways.vim' " {{{2


@@ -117,7 +213,6 @@ Plug 'derekwyatt/vim-fswitch'
 Plug 'elzr/vim-json'
 Plug 'firef0x/pkgbuild.vim'
 Plug 'junegunn/vim-easy-align'
 Plug 'elzr/vim-json'
 Plug 'firef0x/pkgbuild.vim'
 Plug 'junegunn/vim-easy-align'

-Plug 'justinmk/vim-sneak'

 Plug 'klen/python-mode'
 Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'klen/python-mode'
 Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'


@@ -127,11 +222,8 @@ Plug 'skywind3000/asyncrun.vim' " {{{2
 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
 let g:asyncrun_open = 10
 "}}}
 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
 let g:asyncrun_open = 10
 "}}}

-Plug 'shougo/unite.vim'
-Plug 'shougo/vimproc.vim', {'do': 'make'}

 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'
 Plug 'sjl/gundo.vim'
 Plug 'thinca/vim-qfreplace'

-Plug 'tomtom/tcomment_vim'

 Plug 'tpope/vim-abolish'
 Plug 'tpope/vim-characterize'
 Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-abolish'
 Plug 'tpope/vim-characterize'
 Plug 'tpope/vim-endwise'


@@ -146,11 +238,6 @@ Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
 Plug 'wincent/loupe'
 
 Plug 'vim-scripts/replacewithregister'
 Plug 'wincent/loupe'
 

-" colorschemes
-Plug 'morhetz/gruvbox' " {{{2
-let g:gruvbox_contrast_dark  = 'hard'
-let g:gruvbox_contrast_light = 'soft'
-

 " text objects
 Plug 'kana/vim-textobj-user'
 Plug 'julian/vim-textobj-variable-segment'
 " text objects
 Plug 'kana/vim-textobj-user'
 Plug 'julian/vim-textobj-variable-segment'


@@ -161,7 +248,6 @@ Plug 'kana/vim-operator-user'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plug 'imsnif/kdl.vim'
 
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 Plug 'imsnif/kdl.vim'
 

-Plug 'puremourning/vimspector'

 Plug 'ilyachur/cmake4vim'
 Plug 'ilyachur/gtest-vim'
 
 Plug 'ilyachur/cmake4vim'
 Plug 'ilyachur/gtest-vim'
 


@@ -172,10 +258,6 @@ let g:peekaboo_compact = 1
 let g:peekaboo_delay = 500
 "}}}
 
 let g:peekaboo_delay = 500
 "}}}
 

-Plug 'vim-scripts/syntaxrange'
-
-let g:org_agenda_files = ['~/org/**.org']
-

 Plug 'vim-scripts/ansiesc.vim' "{{{2
 nmap corwp <Plug>RestoreWinPosn
 nmap coswp <Plug>SaveWinPosn
 Plug 'vim-scripts/ansiesc.vim' "{{{2
 nmap corwp <Plug>RestoreWinPosn
 nmap coswp <Plug>SaveWinPosn


@@ -793,66 +875,6 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 

-" tcomments {{{2
-let g:tcomment_textobject_inlinecomment = 'gic'
-let g:tcomment#filetype#guess = 0
-"let g:tcomment#options = {'whitespace' : 'no'}
-
-" unite {{{2
-call unite#filters#matcher_default#use(['matcher_fuzzy'])
-call unite#custom#profile('default', 'context', {
-            \ 'winheight': 20,
-            \ 'direction': 'botright'
-            \ })
-
-nnoremap [unite] <Nop>
-nmap <leader>u [unite]
-nnoremap [unite]u :UniteResume<CR>
-nnoremap <silent> [u :UnitePrevious<CR>
-nnoremap <silent> ]u :UniteNext<CR>
-
-" unite-grep {{{3
-" seems not respected
-let g:unite_source_grep_max_candidates = 2000
-if executable('ag')
-    " Use ag in unite grep source.
-    let g:unite_source_grep_command = 'ag'
-    let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
-    let g:unite_source_grep_recursive_opt = ''
-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=+ Ag Unite grep:.::<args>
-
-" unite-file_rec {{{3
-if executable('ag')
-    " Use ag in unite rec source
-    let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', '']
-end
-nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
-call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta')
-
-" unite-buffer {{{3
-call unite#custom#default_action('buffer', 'open')
-nnoremap <silent> [unite]b :<C-u>Unite buffer:-<CR>
-
-" unite-jumplist {{{3
-nnoremap <silent> [unite]j :<C-u>Unite output:jumps:<CR>
-
-" unite-menu {{{3
-let g:unite_source_menu_menus = {}
-let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
-let g:unite_source_menu_menus.fugitive.command_candidates = {
-            \ 'Gstatus <Leader>gs' : 'Gstatus',
-            \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
-            \ 'Glog' : 'Glog',
-            \}
-
-nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
-
-let g:unite_source_history_yank_enable = 1
-nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
-

 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter>   <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to \16<leader>a now" \| echohl None<CR>
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 vmap <Enter>   <Esc>:echohl WarningMsg \| echo "EasyAlign mapped to \16<leader>a now" \| echohl None<CR>


@@ -871,25 +893,6 @@ nnoremap <silent> <Leader>tu :GTestRunUnderCursor<CR>
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 

-" vim-sneak {{{2
-let g:sneak#streak = 1
-let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
-let g:sneak#use_ic_scs = 1  " follow 'ignorecase' and 'smartcase'
-
-" sneaky f and t
-nmap f <Plug>Sneak_f
-nmap F <Plug>Sneak_F
-xmap f <Plug>Sneak_f
-xmap F <Plug>Sneak_F
-omap f <Plug>Sneak_f
-omap F <Plug>Sneak_F
-nmap t <Plug>Sneak_t
-nmap T <Plug>Sneak_T
-xmap t <Plug>Sneak_t
-xmap T <Plug>Sneak_T
-omap t <Plug>Sneak_t
-omap T <Plug>Sneak_T
-

 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the
 " functions {{{1
 
 " Convenient command to see the difference between the current buffer and the