From e9a18f532236013ecfe6672edab8d3ee8a335356 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim.huizinga@gmail.com>
Date: Sun, 2 Aug 2015 20:19:36 +0200
Subject: [PATCH] Fixed tmux intergration with vim and added glsl syntax
 highlighter

---
 nvim/.nvim/plugged/glsl.vim     |  1 +
 nvim/.nvim/plugged/indentLine   |  2 +-
 nvim/.nvim/plugged/nerdtree     |  2 +-
 nvim/.nvim/plugged/tcomment_vim |  2 +-
 nvim/.nvim/plugged/vim-exchange |  2 +-
 nvim/.nvim/plugged/vim-snippets |  2 +-
 nvim/.nvimrc                    |  9 +++++++--
 tmux/.tmux.conf                 | 11 +++++++----
 8 files changed, 20 insertions(+), 11 deletions(-)
 create mode 160000 nvim/.nvim/plugged/glsl.vim

diff --git a/nvim/.nvim/plugged/glsl.vim b/nvim/.nvim/plugged/glsl.vim
new file mode 160000
index 0000000..9bc625e
--- /dev/null
+++ b/nvim/.nvim/plugged/glsl.vim
@@ -0,0 +1 @@
+Subproject commit 9bc625e4d5fc8cee40dfa9e811aa210e5dba945f
diff --git a/nvim/.nvim/plugged/indentLine b/nvim/.nvim/plugged/indentLine
index efce4fa..300c719 160000
--- a/nvim/.nvim/plugged/indentLine
+++ b/nvim/.nvim/plugged/indentLine
@@ -1 +1 @@
-Subproject commit efce4fa4a48c3060dcf2173e099a2bf52d727225
+Subproject commit 300c719b3e0348a65457109386ded3f32f7cd319
diff --git a/nvim/.nvim/plugged/nerdtree b/nvim/.nvim/plugged/nerdtree
index 86e2e40..bcf3de4 160000
--- a/nvim/.nvim/plugged/nerdtree
+++ b/nvim/.nvim/plugged/nerdtree
@@ -1 +1 @@
-Subproject commit 86e2e40af161e65a3ad671214f16f23af360a5a7
+Subproject commit bcf3de4fdffae45fc7c85b6b84a01b37177924aa
diff --git a/nvim/.nvim/plugged/tcomment_vim b/nvim/.nvim/plugged/tcomment_vim
index d445d1a..e0e5e41 160000
--- a/nvim/.nvim/plugged/tcomment_vim
+++ b/nvim/.nvim/plugged/tcomment_vim
@@ -1 +1 @@
-Subproject commit d445d1a3d7de66923fa4297fd71f8f14f667d340
+Subproject commit e0e5e4170cce6fedf543e1f7d079a4189b3a5bdf
diff --git a/nvim/.nvim/plugged/vim-exchange b/nvim/.nvim/plugged/vim-exchange
index f8f96d8..93ef4c9 160000
--- a/nvim/.nvim/plugged/vim-exchange
+++ b/nvim/.nvim/plugged/vim-exchange
@@ -1 +1 @@
-Subproject commit f8f96d83ceeb048bef002a2e79ec061ce343d0eb
+Subproject commit 93ef4c9e42cd6da4e37a935c4799dcf8e24af9b1
diff --git a/nvim/.nvim/plugged/vim-snippets b/nvim/.nvim/plugged/vim-snippets
index c5af9b9..af3c2d3 160000
--- a/nvim/.nvim/plugged/vim-snippets
+++ b/nvim/.nvim/plugged/vim-snippets
@@ -1 +1 @@
-Subproject commit c5af9b925f9213c290bf5253eac116987516d057
+Subproject commit af3c2d3f66a6c7bf200f671ee76efdbad33ce69f
diff --git a/nvim/.nvimrc b/nvim/.nvimrc
index 1a77019..49f8b08 100644
--- a/nvim/.nvimrc
+++ b/nvim/.nvimrc
@@ -19,12 +19,13 @@ Plug 'MarcWeber/vim-addon-mw-utils'
 Plug 'tomtom/tlib_vim'
 Plug 'garbas/vim-snipmate'
 Plug 'honza/vim-snippets'
+Plug 'beyondmarc/glsl.vim'
 " Plug 'Valloric/YouCompleteMe'
 call plug#end()
 
 let g:neomake_airline=1
 
-let g:ctrlp_match_func = { 'match': 'pymatcher#PyMatch' }
+" let g:ctrlp_match_func = { 'match': 'pymatcher#PyMatch' }
 let g:ctrlp_custom_ignore = '\v[\/](build|bin)$'
 
 let delimitMate_expand_cr = 1
@@ -48,7 +49,7 @@ let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_theme='gruvbox'
 
-map <M-l> :TmuxNavigateLeft<cr>
+map <M-h> :TmuxNavigateLeft<cr>
 map <M-j> :TmuxNavigateDown<cr>
 map <M-k> :TmuxNavigateUp<cr>
 map <M-l> :TmuxNavigateRight<cr>
@@ -66,6 +67,9 @@ let g:SuperTabDefaultCompletionType = "<C-X><C-O>"
 
 " let g:SuperTabDefaultCompletionType = "<c-n>"
 
+let g:glsl_default_version = 'glsl330'
+let g:glsl_file_extensions = '*.glsl,*.vsh,*.fsh'
+
 syntax on
 filetype plugin indent on
 
@@ -88,3 +92,4 @@ map <S-K> <pageup>
 map <silent> <F9> :make<cr>:cw<cr>
 map <F10> :make execute<cr>
 map <F12> :!ctags -R --c++-kinds=+p --fields=+iaS --extra=+q .<CR>
+
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 488ff1f..744b59b 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -9,10 +9,13 @@ set -s escape-time 0
 unbind C-b
 set -g prefix C-a
 
-bind -n M-k run-shell 'tmux-vim-select-pane -U'
-bind -n M-j run-shell 'tmux-vim-select-pane -D'
-bind -n M-h run-shell 'tmux-vim-select-pane -L'
-bind -n M-l run-shell 'tmux-vim-select-pane -R'
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
+bind -n M-h if-shell "$is_vim" "send-keys M-h" "select-pane -L"
+bind -n M-j if-shell "$is_vim" "send-keys M-j" "select-pane -D"
+bind -n M-k if-shell "$is_vim" "send-keys M-k" "select-pane -U"
+bind -n M-l if-shell "$is_vim" "send-keys M-l" "select-pane -R"
+bind -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l"
+
 bind -n C-j new-window
 bind -n C-h prev
 bind -n C-l next