From cb8d567b9baed4dcaf0ccf52cb7e1f64c39d0895 Mon Sep 17 00:00:00 2001
From: dummy <dummy@example.com>
Date: Fri, 23 Oct 2020 11:05:18 -0400
Subject: [PATCH] fix bug with tmux_navigator plugin, and reorganize vimrc

---
 vim/.vimrc | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index 0dc817f..6ea3c77 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -72,12 +72,14 @@ set ttimeoutlen=10
 " line numbering gutter
 set nonu
 
+" override default paste behavior
+xnoremap p pgvy
+
 " gvim options
 if has("gui_running")
 	set lines=60 columns=100
 endif
 
-
 "------------------
 " airline plugin stuffs
 set laststatus=2
@@ -91,24 +93,24 @@ let g:airline_right_altsep = ''
 let g:airline_symbols.maxlinenr = ''
 "let g:airline#extensions#tabline#enabled = 1
 
-
 "------------------
 " custom keybinds
 "	C-PageUp/Down conflicts with xfce-terminal, so there is a trick to fixing
 "	https://unix.stackexchange.com/questions/159979/xfce4-terminal-disable-individual-shortcut
 map <C-PageDown> :bnext<CR>
 map <C-PageUp> :bprev<CR>
-nnoremap <C-J> <C-W><C-J>
-nnoremap <C-K> <C-W><C-K>
-nnoremap <C-L> <C-W><C-L>
-nnoremap <C-H> <C-W><C-H>
-" override default paste behavior
-xnoremap p pgvy
-map <F2> :cn<CR>
-nmap <F4> :bp\|bd #<CR>
+" jump to word under cursor in a preview window
+noremap <F2> :ptjump <c-r><c-w> <cr>
+" search for word under cursor in src/ directory
+noremap <F3> ::AsyncRun grep -RIn <c-r><c-w> <cr>
+noremap <F4> :bp\|bd #<cr>
+noremap <F5> :call RunMake()<cr>
+noremap <F6> :call QfToggle() <cr>
 
 "------------------
 " AsyncRun
+let g:asyncrun_timer = 250
+
 let g:qf_toggle = ''
 "let g:win_save = ''
 function QfToggle()
@@ -135,15 +137,6 @@ function RunMake()
 	:AsyncRun -cwd=<root> -save=2 make -j4
 endfunction
 
-let g:asyncrun_timer = 250
-" jump to word under cursor in a preview window
-noremap <F2> <Esc>:exe "ptjump " . expand("<cword>")<Esc>
-" search for word under cursor in src/ directory
-noremap <F3> ::AsyncRun grep -Rn <c-r><c-w> src/<cr>
-noremap <F5> :call RunMake()<cr>
-noremap <F6> :call QfToggle() <cr>
-
-
 "------------------
 " autocommands
 augroup vimrc