From b771e79c6e58628295ccd6602e539c6e27ed2e82 Mon Sep 17 00:00:00 2001
From: Robert Kmiec <robert.kmiec@7sensingsoftware.com>
Date: Thu, 13 Aug 2020 01:38:49 +0200
Subject: [PATCH] Vim: New mapping style

---
 .vim/vimrc | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.vim/vimrc b/.vim/vimrc
index a53249d..50e3882 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -226,6 +226,10 @@ nnoremap <leader>8 <esc>:set tabstop=8 softtabstop=8 shiftwidth=8<cr>
 
 map <F12> :colorscheme random<CR>
 
+nnoremap S :%s//g<LEFT><LEFT>
+xnoremap S :s//g<LEFT><LEFT>
+xmap <BS> x
+
 " Make pasting done without any indentation break
 set pastetoggle=<F3>
 
@@ -244,8 +248,8 @@ nmap <silent> gr <Plug>(coc-references)
 
 nnoremap <silent> <space>k :call <SID>show_documentation()<CR>
 
-xmap <leader>f  <Plug>(coc-format-selected)
-nmap <leader>f  <Plug>(coc-format-selected)
+"xmap <leader>f  <Plug>(coc-format-selected)
+"nmap <leader>f  <Plug>(coc-format-selected)
 
 " Show all diagnostics
 nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>
@@ -274,14 +278,31 @@ nmap <leader>n <plug>(YoinkPostPasteSwapForward)
 nmap p <plug>(YoinkPaste_p)
 nmap P <plug>(YoinkPaste_P)
 
-nnoremap <leader>l :Lines<CR>
-nnoremap <leader>b :Buffers<CR>
-nnoremap <leader>s :Snippets<CR>
-nnoremap <leader>a :Ag <C-R><C-W><CR>
+" Mapping to NERDTree
+nnoremap <leader>t :NERDTreeToggle<CR>
+let NERDTreeIgnore=['\.vim$', '\~$', '\.pyc$']
+"nnoremap <C-n> :e .<CR>
+"let g:netrw_banner=0
+"let g:netrw_wisize=20
+"let g:netrw_liststyle=3
+"let g:netrw_lolcalrmdir='rm -r'
+"nnoremap <leader>n :Lexplore<CR>
 
 " Tagbar key bindings."
 "nmap <leader>t :TlistToggle<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'
+nnoremap <leader>fl :Lines<CR>
+nnoremap <leader>fb :Buffers<CR>
+inoremap <leader>fs <ESC>:Snippets<CR>
+nnoremap <leader>fa :Ag <C-R><C-W><CR>
+
+nnoremap <leader>ff :FZF<CR>
+
 " }}}
 " }}}
 
@@ -371,33 +392,12 @@ endif
 
 set updatetime=100
 
-" 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'
-nnoremap <c-p> :FZF<CR>
-
 set nospell
 set runtimepath+=/usr/share/vim/vimfiles
 set spelllang=en
 " Dictionary path, from which the words are being looked up.
 set dictionary+=/usr/share/dict/words
 
-" Mapping to NERDTree
-nnoremap <C-n> :NERDTreeToggle<CR>
-let NERDTreeIgnore=['\.vim$', '\~$', '\.pyc$']
-"nnoremap <C-n> :e .<CR>
-"let g:netrw_banner=0
-"let g:netrw_wisize=20
-"let g:netrw_liststyle=3
-"let g:netrw_lolcalrmdir='rm -r'
-"nnoremap <leader>n :Lexplore<CR>
-
-nnoremap S :%s//g<LEFT><LEFT>
-xnoremap S :s//g<LEFT><LEFT>
-xmap <BS> x
-
 function! FindAlternate()
 	let l:ext = 'h'
 	let l:curr_ext = expand('%:e')