vim: replace yankring with vim-yoink

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index db6f710be1c263ad726dda08d6c3463ff718a471..20c910e53a1f2e0eae34a5ab7685a701756735f3 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -72,7 +72,9 @@ Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-speeddating'
-Plug 'tpope/vim-surround'  "investigate vim-sandwich
+if !has('nvim')
+  Plug 'tpope/vim-surround'  "investigate vim-sandwich
+endif
 Plug 'tpope/vim-unimpaired'
 Plug 'tweekmonster/spellrotate.vim'
 if !has("nvim")
@@ -99,7 +101,9 @@ if !has("nvim")
 endif
 Plug 'vim-scripts/mediawiki.vim'
 Plug 'vim-scripts/replacewithregister'
-Plug 'vim-scripts/yankring.vim'
+if !has('nvim')
+  Plug 'svermeulen/vim-yoink'
+end
 Plug 'wincent/loupe'
 
 " colorschemes
@@ -860,17 +864,6 @@ 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>
 
-" yankring {{{2
-nnoremap <silent> <leader>p :YRShow<cr>
-let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')
-let g:yankring_replace_n_pkey = ''
-let g:yankring_replace_n_nkey = ''
-
-" map Y to y$ for the yank ring
-function! YRRunAfterMaps()
-    nnoremap Y   :<C-U>YRYankCount 'y$'<CR>
-endfunction
-
 " 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>