Adds new keybinds and bash functions for git

2 files changed, 39 insertions, 3 deletions

diff --git a/functions/misc_functions.sh b/functions/misc_functions.sh
index 17c13d7a6ae9..ed7f6293c08f 100644
--- a/functions/misc_functions.sh
+++ b/functions/misc_functions.sh
@@ -1,3 +1,15 @@
+# fuzzily-find-file
+function wgff {
+  echo $(find . -type f | fzf)
+}
+
+
+# fuzzily-find-branch
+function wgfb {
+  echo $(git branch -a | fzf)
+}
+
+
 # download files to /tmp directory
 function wdownload {
   URL="$1"
diff --git a/usbify/vim/.vimrc b/usbify/vim/.vimrc
index db8a40b4ef5a..ce78f2100384 100644
--- a/usbify/vim/.vimrc
+++ b/usbify/vim/.vimrc
@@ -46,6 +46,12 @@ filetype plugin indent on    " required
 " -- END: Vundle config --
 
 
+set noswapfile
+
+
+set grepprg=ack\ -k
+
+
 " backspace settings
 set backspace=2
 set backspace=indent,eol,start
@@ -82,10 +88,28 @@ let g:UltiSnipsExpandTrigger="<c-x>"
 " let g:UltiSnipsJumpBackwardTrigger="<c-k>"
 
 
-
 " keyword completion
 inoremap ;; <C-n>
 
+" tab movement bindings
+nnoremap <C-h> gT
+nnoremap <C-l> gt
+
+" scrolling and maintaing mouse position
+nnoremap <C-j> j<C-e>
+nnoremap <C-k> k<C-y>
+
+
+" reload file after git changes
+nnoremap <C-r> :e<CR>
+
+
+" resize vertical and horizontal splits
+nnoremap <C-w><C-l> :vertical resize +3<CR>
+nnoremap <C-w><C-h> :vertical resize -3<CR>
+nnoremap <C-w><C-k> :resize +3<CR>
+nnoremap <C-w><C-j> :resize -3<CR>
+
 
 " -- Syntastic Settings --
 set statusline+=%#warningmsg#
@@ -105,7 +129,7 @@ set number
 set tabstop=2
 set expandtab
 set shiftwidth=2
-colorscheme monokai
+colorscheme elflord
 set t_Co=255
 
 
@@ -138,7 +162,7 @@ nnoremap <silent> <leader>xhh :execute 'match none'<CR> :execute '2match none'<C
 " pasteboard copy & paste
 nnoremap <C-c> V"+y
 vnoremap <C-c> "+y
-nnoremap <C-v> "+p
+nnoremap <C-v> o<Esc>"+p
 vnoremap <C-v> "+p