From 42b6817e390dcfabc9cec7725477c9546ef7595d Mon Sep 17 00:00:00 2001
From: Ian Keane <Keanerec@gmail.com>
Date: Mon, 15 Mar 2021 19:09:16 +0000
Subject: [PATCH] Vim / tmux integration

---
 tmux/.tmux.conf |  3 ++-
 vim/.vimrc      | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 6afeee4..bff9299 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -1,8 +1,9 @@
 set-option -g default-shell /bin/zsh
-set -g default-terminal "rxvt-unicode-256color"
+set -g default-terminal "screen-256color"
 # set-window-option -g mode-keys vi
 
 set-window-option -g automatic-rename on
+set-window-option mode-keys vi
 
 bind h split-window -h -c "#{pane_current_path}"
 bind v split-window -v -c "#{pane_current_path}"
diff --git a/vim/.vimrc b/vim/.vimrc
index 0edad7a..0393713 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -43,12 +43,14 @@
     Plug 'tpope/vim-fireplace'
     Plug 'guns/vim-sexp'
     Plug 'tpope/vim-sexp-mappings-for-regular-people'
-    Plug 'dylanaraps/wal.vim'
+    "Plug 'dylanaraps/wal.vim'
     Plug 'alvan/vim-closetag'
     Plug 'mattn/emmet-vim'
     " Plug 'tpope/vim-salve'
     Plug 'chrisbra/colorizer'
     " cljfold
+    Plug 'christoomey/vim-tmux-navigator'
+    
 
 "    " Todo:
 "    "
@@ -170,7 +172,7 @@
     nnoremap <leader>d k :r !date <cr>
 
     nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
-    tnoremap <leader><esc> <C-\><C-n>
+    " tnoremap <leader><esc> <C-\><C-n>
 
 "}}}
 
@@ -237,13 +239,13 @@
     nnoremap <C-c> :close <cr>
     nnoremap <C-n> :bn <cr>
     " Term  mode
-    tnoremap <C-h> <C-w>h
-    tnoremap <C-j> <C-w>j
-    tnoremap <C-k> <C-w>k
-    tnoremap <C-l> <C-w>l
-    tnoremap <C-c> :close <cr>
-    tnoremap <C-n> :bn <cr>
-    tnoremap <Esc> <C-\><C-n>
+    " tnoremap <C-h> <C-w>h
+    " tnoremap <C-j> <C-w>j
+    " tnoremap <C-k> <C-w>k
+    " tnoremap <C-l> <C-w>l
+    " tnoremap <C-c> :close <cr>
+    " tnoremap <C-n> :bn <cr>
+    " tnoremap <Esc> <C-\><C-n>
 
     " TODO: remap pane resize to something else (leader?)
     " quick-scope