From 18058c5c8326fdf1de034d2ff4516da5c9c52e14 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Thu, 4 May 2023 01:25:41 +0100 Subject: [PATCH] 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. --- vim/vimrc | 205 +++++++++++++++++++++++++++--------------------------- 1 file changed, 104 insertions(+), 101 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 6bf709a..c1dc477 100644 --- 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 "}}} - 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") ] @@ -94,17 +94,113 @@ if !has("nvim") au InsertEnter * exec "inoremap " . g:UltiSnipsExpandTrigger . " =g:UltiSnips_Complete()" let g:UltiSnipsListSnippets="" "}}} - Plug 'vim-utils/vim-man' " {{{2 + Plug 'vim-utils/vim-man' " replaced by builtin {{{2 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 Sneak_f + nmap F Sneak_F + xmap f Sneak_f + xmap F Sneak_F + omap f Sneak_f + omap F Sneak_F + nmap t Sneak_t + nmap T Sneak_T + xmap t Sneak_t + xmap T Sneak_T + omap t Sneak_t + omap T 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] + nmap u [unite] + nnoremap [unite]u :UniteResume + nnoremap [u :UnitePrevious + nnoremap ]u :UniteNext + + " 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 [unite]a :Unite grep:.:: + nnoremap [unite]A :Unite grep:.:-w: + command! -nargs=+ Ag Unite grep:.:: + + " 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 [unite]f :Unite -start-insert file_rec/async + + " unite-buffer {{{3 + call unite#custom#default_action('buffer', 'open') + nnoremap [unite]b :Unite buffer:- + + " unite-jumplist {{{3 + nnoremap [unite]j :Unite output:jumps: + + " 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 gs' : 'Gstatus', + \ 'Gcommit -v gc' : 'Gcommit -v', + \ 'Glog' : 'Glog', + \} + + nnoremap gg :Unite menu:fugitive + + let g:unite_source_history_yank_enable = 1 + nnoremap [unite]p :Unite history/yank + 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 -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 @@ -117,7 +213,6 @@ Plug 'derekwyatt/vim-fswitch' 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' @@ -127,11 +222,8 @@ Plug 'skywind3000/asyncrun.vim' " {{{2 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ let g:asyncrun_open = 10 "}}} -Plug 'shougo/unite.vim' -Plug 'shougo/vimproc.vim', {'do': 'make'} Plug 'sjl/gundo.vim' Plug 'thinca/vim-qfreplace' -Plug 'tomtom/tcomment_vim' 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' -" 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' @@ -161,7 +248,6 @@ Plug 'kana/vim-operator-user' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp Plug 'imsnif/kdl.vim' -Plug 'puremourning/vimspector' Plug 'ilyachur/cmake4vim' Plug 'ilyachur/gtest-vim' @@ -172,10 +258,6 @@ let g:peekaboo_compact = 1 let g:peekaboo_delay = 500 "}}} -Plug 'vim-scripts/syntaxrange' - -let g:org_agenda_files = ['~/org/**.org'] - Plug 'vim-scripts/ansiesc.vim' "{{{2 nmap corwp RestoreWinPosn nmap coswp SaveWinPosn @@ -793,66 +875,6 @@ let g:tagbar_autoshowtag = 1 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] -nmap u [unite] -nnoremap [unite]u :UniteResume -nnoremap [u :UnitePrevious -nnoremap ]u :UniteNext - -" 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 [unite]a :Unite grep:.:: -nnoremap [unite]A :Unite grep:.:-w: -command! -nargs=+ Ag Unite grep:.:: - -" 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 [unite]f :Unite -start-insert file_rec/async -call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') - -" unite-buffer {{{3 -call unite#custom#default_action('buffer', 'open') -nnoremap [unite]b :Unite buffer:- - -" unite-jumplist {{{3 -nnoremap [unite]j :Unite output:jumps: - -" 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 gs' : 'Gstatus', - \ 'Gcommit -v gc' : 'Gcommit -v', - \ 'Glog' : 'Glog', - \} - -nnoremap gg :Unite menu:fugitive - -let g:unite_source_history_yank_enable = 1 -nnoremap [unite]p :Unite history/yank - " vim-easy-align {{{2 " start interactive EasyAlign in visual mode vmap :echohl WarningMsg \| echo "EasyAlign mapped to a now" \| echohl None @@ -871,25 +893,6 @@ nnoremap tu :GTestRunUnderCursor " 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 Sneak_f -nmap F Sneak_F -xmap f Sneak_f -xmap F Sneak_F -omap f Sneak_f -omap F Sneak_F -nmap t Sneak_t -nmap T Sneak_T -xmap t Sneak_t -xmap T Sneak_T -omap t Sneak_t -omap T Sneak_T - " functions {{{1 " Convenient command to see the difference between the current buffer and the -- 2.48.1