From b66a4b2dca5f5fec4783de69393ecfd069e6adae Mon Sep 17 00:00:00 2001
From: Robert Kmiec <robert.kmiec@7sensingsoftware.com>
Date: Thu, 2 Jul 2020 09:32:16 +0200
Subject: [PATCH] Vim: Reorganize plugins, add new ones

---
 .vim/vimrc | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/.vim/vimrc b/.vim/vimrc
index 0762f5b..c5f1b33 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -42,23 +42,27 @@ Plugin 'jackguo380/vim-lsp-cxx-highlight'
 Plugin 'tpope/vim-commentary' " Toggle C style comments with gc
 "Plugin 'KabbAmine/zeavim.vim' " gz to open zeal
 Plugin 'mbbill/undotree'
-Plugin 'kkoomen/vim-doge'
+"Plugin 'kkoomen/vim-doge'
 Plugin 'SirVer/ultisnips'
 Plugin 'honza/vim-snippets'
 Plugin 'wellle/context.vim'
 Plugin 'svermeulen/vim-yoink'
+Plugin 'will133/vim-dirdiff'
+Plugin 'n0v1c3/vira'
 " }}}
 
 " Files switch, jump and grep-like tools {{{
 "Plugin 'ericcurtin/CurtineIncSw.vim' "Toggle .c .h files
 Plugin 'preservim/nerdtree'
 Plugin 'Xuyuanp/nerdtree-git-plugin'
-Plugin 'mileszs/ack.vim' " Ack integration
+"Plugin 'mileszs/ack.vim' " Ack integration
 Plugin 'junegunn/fzf.vim'
+"Plugin 'fholgado/minibufexpl.vim'
 Plugin 'justinmk/vim-sneak' " easy movement
 Plugin 'ludovicchabant/vim-gutentags' "Auto generate tags
 Plugin 'liuchengxu/vista.vim'
 Plugin 'wellle/targets.vim'
+Plugin 'inside/vim-search-pulse'
 " }}}
 
 " Git integration {{{
@@ -75,7 +79,7 @@ Plugin 'pboettch/vim-cmake-syntax'
 " }}}
 
 " Colorschemes {{{
-Plugin 'flazz/vim-colorschemes' " lots of colorschemes
+"Plugin 'flazz/vim-colorschemes' " lots of colorschemes
 "Plugin 'jeaye/color_coded'
 "Plugin 'thiagoalessio/rainbow_levels.vim'
 "Plugin 'fielding/vice'
@@ -89,7 +93,6 @@ Plugin 'vimwiki/vimwiki'
 "Plugin 'metakirby5/codi.vim' " live coding
 Plugin 'vim-airline/vim-airline'
 Plugin 'mhinz/vim-startify'
-Plugin 'n0v1c3/vira'
 " }}}
 
 call vundle#end()            " required
@@ -182,9 +185,15 @@ let mapleader = "\\"
 
 " Make pasting done without any indentation break
 set pastetoggle=<F3>
+set clipboard=unnamed
 
-nnoremap j gj
-nnoremap k gk
+nnoremap <leader>j J
+nnoremap <leader>k K
+nnoremap J 5j
+nnoremap K 5k
+
+"nnoremap j gj
+"nnoremap k gk
 
 " Get Rid of stupid Goddamned help keys
 inoremap <F1> <ESC>
@@ -322,8 +331,6 @@ nnoremap <Home> zm
 nnoremap <End> zr
 " }}}
 
-nnoremap <leader>s :mksession!<CR>
-
 set updatetime=100
 
 " From C.vim:
@@ -493,7 +500,7 @@ set statusline+=%{NearestMethodOrFunction()}
 autocmd VimEnter * call vista#RunForNearestMethodOrFunction()
 
 let g:UltiSnipsExpandTrigger="<tab>"
-let g:UltiSnipsJumpForwardTrigger="<cr>"
+let g:UltiSnipsJumpForwardTrigger="<CR>"
 let g:UltiSnipsJumpBackwardTrigger="<leader>p"
 
 " yoink configuration
@@ -501,3 +508,13 @@ nmap <leader>p <plug>(YoinkPostPasteSwapBack)
 nmap <leader>n <plug>(YoinkPostPasteSwapForward)
 nmap p <plug>(YoinkPaste_p)
 nmap P <plug>(YoinkPaste_P)
+
+hi None ctermbg=None ctermfg=None
+
+nnoremap <leader>l :Lines<CR>
+nnoremap <leader>b :Buffers<CR>
+nnoremap <leader>s :Snippets<CR>
+nnoremap <leader>a :Ag <C-R><C-W><CR>
+
+let g:vim_search_pulse_mode = 'pattern'
+let g:vim_search_pulse_duration = 400