X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/6b26cd88e19a47b65fe17a429a70e18c9580d036..3df163d82083e46eae77a77e2c47caa19e884fcd:/vim/vimrc?ds=inline

diff --git a/vim/vimrc b/vim/vimrc
index 6657132..df8e279 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -48,7 +48,12 @@ Plug 'klen/python-mode'
 Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
-Plug 'raimondi/delimitmate'
+if !has('nvim')
+  Plug 'raimondi/delimitmate' " {{{2
+  let delimitMate_expand_cr = 2
+  let g:delimitMate_expand_space = 1
+  "}}}
+end
 Plug 'sgeb/vim-diff-fold'
 Plug 'skywind3000/asyncrun.vim' " {{{2
 command! -bang -nargs=* -complete=file Make AsyncRun -save=2 -program=make @ <args>
@@ -67,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")
@@ -94,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
@@ -167,10 +176,21 @@ Plug 'puremourning/vimspector'
 Plug 'ilyachur/cmake4vim'
 Plug 'ilyachur/gtest-vim'
 
-Plug 'git@github.com:/ram-z/vim-orgmode', { 'branch': 'dev' } " {{{2
+Plug 'junegunn/vim-peekaboo' "{{{2
+" issue with having it at the bottom is that it doesn't leave much 
+let g:peekaboo_window = 'bo 16new'
+let g:peekaboo_compact = 1
+let g:peekaboo_delay = 500
+"}}}
+
 Plug 'vim-scripts/syntaxrange'
 
-let g:org_agenda_files = ['~/org/*.org']
+let g:org_agenda_files = ['~/org/**.org']
+
+Plug 'vim-scripts/ansiesc.vim' "{{{2
+nmap corwp <Plug>RestoreWinPosn
+nmap coswp <Plug>SaveWinPosn
+"}}}
 
 Plug 'neovimhaskell/haskell-vim'  " {{{2
 let g:haskell_enable_quantification = 1   " to enable highlighting of `forall`
@@ -676,9 +696,6 @@ nnoremap <silent> <C-W>cl :CloseRightWindow<CR>
 nnoremap <silent> <C-W>cj :CloseBelowWindow<CR>
 nnoremap <silent> <C-W>ck :CloseAboveWindow<CR>
 
-" delimitmate {{{2
-let delimitMate_expand_cr = 2
-let g:delimitMate_expand_space = 1
 
 " fswitch {{{2
 nnoremap <silent> <Leader>ff :FSHere<CR>
@@ -858,17 +875,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 <leader>a now" \| echohl None<CR>