From 70e9b0785b67d0624009595cd9061ef44614cf69 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@taylorbockman.com>
Date: Sat, 22 Apr 2017 16:40:11 -0700
Subject: [PATCH] Get ctrl-p more comfortable, rebind tmux create window to the
 same keys as nerdtree for consistency

---
 dotfiles/config/nvim/init.vim | 17 +++++++----------
 dotfiles/resize-pane          |  0
 dotfiles/tmux.conf            |  6 +++---
 3 files changed, 10 insertions(+), 13 deletions(-)
 create mode 100644 dotfiles/resize-pane

diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index d02a218..98c6854 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -120,7 +120,7 @@ set shiftround
 set list
 set list listchars=tab:»·,trail:·
 
-" custom functons
+" custom functions
 function! NumberToggle()
   if(&relativenumber == 1)
     set norelativenumber
@@ -168,6 +168,12 @@ nnoremap <silent> + :tabn<CR>
 let g:ctrlp_map='<c-p>'
 let g:ctrlp_cmd='CtrlP'
 
+" Rebind Ctrl-P to match the window opening keys of nerd tree
+let g:ctrl_p_prompt_mappings = {
+  \ 'AcceptSelection("h")': ['<c-i>', '<c-cr>', '<c-s>'],
+  \ 'AcceptSelection("v")': ['<c-s>', '<RightMouse>'],
+\ }
+
 " ctrlp configuration
 set wildignore+=*/tmp/*,*.so,*.swp,*.zip      " MacOSX/Linux
 set wildignore+=*\\tmp\\*,*.swp,*.zip,*.exe   " Windows
@@ -186,12 +192,9 @@ endif
 let g:syntastic_javascript_checkers = ['eslint']
 let g:syntastic_javascript_jsxhint_exec = 'eslint'
 
-" Indent lines customizations
-
 " Color customizations
 colorscheme zenburn
 
-
 " Python-mode settings
 
 " disable pymode folding
@@ -223,12 +226,6 @@ nnoremap <F9> za
 onoremap <F9> <C-C>za
 vnoremap <F9> zf
 
-" Rebind Ctrl-P to match the window opening keys of nerd tree
-let g:ctrl_p_prompt_mappings = {
-  \ 'AcceptSelection("h")': ['<c-s>', '<c-cr>', '<c-s>'],
-  \ 'AcceptSelection("v")': ['<c-i>', '<RightMouse>']
-}
-
 " Line indent guides are defaulted to off
 let g:indentLine_enabled=0
 
diff --git a/dotfiles/resize-pane b/dotfiles/resize-pane
new file mode 100644
index 0000000..e69de29
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 152d17b..d30ba78 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -52,10 +52,10 @@ set-window-option -g window-status-bell-style fg=black,bg=red    #base02, red
 bind Space copy-mode
 bind C-Space copy-mode
 
-# Rebinds to be like neotree
+# Rebinds to be like nerdtree
 unbind %
-bind i split-window -h
-bind s split-window -v
+bind s split-window -h
+bind i split-window -v
 
 # Smart pane switching with awareness of vim splits
 # This is the tmux side of the vim-tmux-navigator plugin