nvim: replace replacewithregister and sort with mini.operators

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 0a09c8a2a75ffe8b8bf64be0cf29442d1d05cbf7..8cf8255d8e5f13c6580a70b1e1072390f8c8f805 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -201,9 +201,15 @@ if !has("nvim")
   " staging
   Plug 'puremourning/vimspector' " replaced by lsp {{{2
     let g:vimspector_enable_mappings = 'HUMAN'
   " staging
   Plug 'puremourning/vimspector' " replaced by lsp {{{2
     let g:vimspector_enable_mappings = 'HUMAN'

-  " }}}

   Plug 'vim-scripts/syntaxrange' " replaced by treesitter {{{2
   Plug 'vim-scripts/syntaxrange' " replaced by treesitter {{{2

-  " }}}
+  Plug 'vim-scripts/replacewithregister' " replaced by mini.operators {{{2
+  " sort operator replaced by mini.operaters {{{2
+  function! SortLinesOpFunc(...)
+    '[,']sort
+  endfunction
+  nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
+  vnoremap <silent> gs :sort<cr>
+  " }}}2

 endif
 
 Plug 'alepez/vim-gtest'
 endif
 
 Plug 'alepez/vim-gtest'


@@ -239,14 +245,15 @@ Plug 'tpope/vim-abolish'
 Plug 'tpope/vim-characterize'
 " Plug 'tpope/vim-endwise' " TODO: delete?
 Plug 'tpope/vim-eunuch'
 Plug 'tpope/vim-characterize'
 " Plug 'tpope/vim-endwise' " TODO: delete?
 Plug 'tpope/vim-eunuch'

-Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-fugitive'  " {{{2
+let g:fugitive_legacy_commands = v:false
+"}}}

 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 " Plug 'vim-scripts/mediawiki.vim' " TODO: delete?
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-speeddating'
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 " Plug 'vim-scripts/mediawiki.vim' " TODO: delete?

-Plug 'vim-scripts/replacewithregister' " FIXME: is overridden by lsp

 Plug 'wincent/loupe'
 
 " text objects
 Plug 'wincent/loupe'
 
 " text objects


@@ -451,7 +458,9 @@ set shiftround                  " round to 'shiftwidth' for "<<" and ">>"
 set expandtab                   " expand <Tab> to spaces in Insert mode
 set autoindent
 
 set expandtab                   " expand <Tab> to spaces in Insert mode
 set autoindent
 

-set pastetoggle=<F11>           " key sequence to toggle paste mode
+if !has('nvim')
+  set pastetoggle=<F11>           " key sequence to toggle paste mode
+endif

 
 " folding {{{2
 set foldmethod=marker           " folding type
 
 " folding {{{2
 set foldmethod=marker           " folding type


@@ -921,13 +930,6 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
                   \ | wincmd p | diffthis
 endif
 

-" sort operator {{{2
-function! SortLinesOpFunc(...)
-  '[,']sort
-endfunction
-nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
-vnoremap <silent> gs :sort<cr>
-

 " edit configs  {{{2
 " TODO: populate location list with both .vim and .lua files
 " TODO: create file if it doesn't exist in nvim or vim rtps
 " edit configs  {{{2
 " TODO: populate location list with both .vim and .lua files
 " TODO: create file if it doesn't exist in nvim or vim rtps