From 54e10baa6c8e70193cf1303a6038c7e78d8dd876 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Fri, 20 Oct 2017 19:43:08 -0400
Subject: [PATCH] Updates vimrc movement kbds

---
 configs/shared/.vimrc | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/configs/shared/.vimrc b/configs/shared/.vimrc
index de4ccc198..4507faebb 100644
--- a/configs/shared/.vimrc
+++ b/configs/shared/.vimrc
@@ -74,6 +74,12 @@ Plugin 'tpope/vim-repeat'
 " Pairs of mappings
 Plugin 'tpope/vim-unimpaired'
 
+" LISPs support
+Plugin 'guns/vim-sexp'
+Plugin 'tpope/vim-sexp-mappings-for-regular-people'
+let g:sexp_enable_insert_mode_mappings = 0
+let g:sexp_filetypes = ''
+
 " Seamlessly navigate Vim and Tmux with similar bindings.
 Plugin 'christoomey/vim-tmux-navigator'
 
@@ -219,6 +225,9 @@ nnoremap <Leader>[ :call <SID>LocationPrevious()<CR>
 nnoremap <Leader>] :call <SID>LocationNext()<CR>
 
 
+nnoremap <leader>h :noh<CR>
+
+
 " Alchemist settings
 let g:alchemist#elixir_erlang_src = '/usr/local/share/src'
 
@@ -245,6 +254,9 @@ let g:airline_theme = 'hybrid'
 let g:swoopHighlight = ["hi! link SwoopBufferLineHi Warning", "hi! link SwoopPatternHi Error"]
 
 
+nnoremap <M-q> :q<CR>
+
+
 " Jump to buffers.
 nmap <F1> :1b<CR>
 nmap <F2> :2b<CR>
@@ -360,11 +372,18 @@ set concealcursor=nvic
 inoremap jk <Esc>
 
 
-" Conventional Emacs line-editor defaults
-" NOTE: <C-a> interferes w/ current tmux prefix
+" Hybrid mode for Vim
 inoremap <C-a> <Esc>I
 inoremap <C-e> <Esc>A
 
+inoremap <M-b> <S-Left>
+inoremap <M-f> <S-Right>
+
+inoremap <C-b> <Left>
+inoremap <C-f> <Right>
+inoremap <C-p> <Up>
+inoremap <C-n> <Down>
+
 
 " Manage Vertical and Horizontal splits
 nnoremap sl <Esc>:vs<CR><C-w>l
@@ -382,6 +401,21 @@ nnoremap <leader>q :bdelete<CR>
 set runtimepath^=~/.vim/bundle/ctrlp.vim
 
 
+" Pane movement
+let g:tmux_navigator_no_mappings = 1
+
+nnoremap <silent> <M-h> :TmuxNavigateLeft<cr>
+nnoremap <silent> <M-j> :TmuxNavigateDown<cr>
+nnoremap <silent> <M-k> :TmuxNavigateUp<cr>
+nnoremap <silent> <M-l> :TmuxNavigateRight<cr>
+
+" May need redundant mappings bc of LISP plugin
+nnoremap <silent> <C-h> :TmuxNavigateLeft<cr>
+nnoremap <silent> <C-j> :TmuxNavigateDown<cr>
+nnoremap <silent> <C-k> :TmuxNavigateUp<cr>
+nnoremap <silent> <C-l> :TmuxNavigateRight<cr>
+
+
 " Buffer creation and management
 " Buffer movement
 nnoremap <Tab> :1bnext<CR>
@@ -486,7 +520,7 @@ let NERDTreeShowHidden = 1
 nnoremap <leader>n :NERDTreeToggle<CR>
 
 " View open buffer location in tree.
-nnoremap <leader>f :NERDTreeFind<CR>
+nnoremap <leader>N :NERDTreeFind<CR>
 
 
 " BOL and EOL