From 864ff09d67dffac072448a16e571d684bc3d2523 Mon Sep 17 00:00:00 2001
From: Robert Kmiec <robert.r.kmiec@gmail.com>
Date: Thu, 21 May 2020 02:18:48 +0200
Subject: [PATCH] Vim: Use ultisnips, fzf, fugitive

This is the proper way to use vim
---
 .vimrc | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.vimrc b/.vimrc
index 8707d7c..61e591c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -42,6 +42,8 @@ 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 'SirVer/ultisnips'
+Plugin 'honza/vim-snippets'
 " }}}
 
 " Files switch, jump and grep-like tools {{{
@@ -50,8 +52,8 @@ Plugin 'kkoomen/vim-doge'
 "Plugin 'scrooloose/nerdtree'
 Plugin 'mileszs/ack.vim' " Ack integration
 "Plugin 'jremmen/vim-ripgrep'
-Plugin 'ctrlpvim/ctrlp.vim'
-"Plugin 'junegunn/fzf.vim'
+"Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'junegunn/fzf.vim'
 Plugin 'fholgado/minibufexpl.vim'
 Plugin 'justinmk/vim-sneak' " easy movement
 "Plugin 'easymotion/vim-easymotion'
@@ -66,7 +68,7 @@ Plugin 'wellle/targets.vim'
 "Plugin 'airblade/vim-gitgutter' " Mark edited lines
 Plugin 'mhinz/vim-signify' " Mark edited lines - faster gitgutter
 "Plugin 'rhysd/git-messenger.vim' " show git history
-"Plugin 'tpope/vim-fugitive' " Git integration
+Plugin 'tpope/vim-fugitive' " Git integration
 Plugin 'lambdalisue/gina.vim'
 " }}}
 
@@ -344,10 +346,11 @@ inoremap :w<CR> <Esc>:w<CR>i
 "nnoremap <F2> :silent ! plantuml %:p && eog -g %:p:r.png &<CR>:redraw!<CR>
 
 " ctrlp configuration
-let g:ctrlp_map = '<c-p>'
-let g:ctrlp_cmd = 'CtrlPLastMode'
-let g:ctrlp_user_command = 'ack --cpp --cc --hh --hpp -f %s'
-let g:ctrlp_working_path_mode = 'rw'
+"let g:ctrlp_map = '<c-p>'
+"let g:ctrlp_cmd = 'CtrlPLastMode'
+"let g:ctrlp_user_command = 'ack --cpp --cc --hh --hpp -f %s'
+"let g:ctrlp_working_path_mode = 'rw'
+nnoremap <c-p> :FZF<CR>
 
 tnoremap <Esc> <C-W><C-W>
 
@@ -363,7 +366,7 @@ set dictionary+=/usr/share/dict/words
 "let g:matchparen_insert_timeout = 2
 
 " Mapping to NERDTree
-nnoremap <C-n> :e .<CR>
+"nnoremap <C-n> :e .<CR>
 "let NERDTreeIgnore=['\.vim$', '\~$', '\.pyc$']
 let g:netrw_banner=0
 let g:netrw_wisize=20
@@ -492,3 +495,7 @@ set statusline+=%{NearestMethodOrFunction()}
 "
 " If you want to show the nearest function in your statusline automatically
 autocmd VimEnter * call vista#RunForNearestMethodOrFunction()
+
+let g:UltiSnipsExpandTrigger="<tab>"
+let g:UltiSnipsJumpForwardTrigger="<cr>"
+let g:UltiSnipsJumpBackwardTrigger="<leader>p"