Merge branch 'master' of github.com:uvaes/dotfiles

2 files changed, 13 insertions, 6 deletions

diff --git a/tmux.conf b/tmux.conf
index 28d13bb..eda1d93 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -12,3 +12,9 @@ set -g @tpm_plugins '           \
 set -g @resurrect-strategy-vim 'session'
 
 run-shell '~/.tmux/plugins/tpm/tpm'
+
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
+bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
+bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
+bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
+bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
diff --git a/vim/vimrc b/vim/vimrc
index ad31a5f..3edbdd1 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -6,21 +6,22 @@ set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
 
 ""  Plugins
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-obsession'
+Plugin 'tpope/vim-sensible'
+Plugin 'tpope/vim-scriptease'
+Plugin 'tpope/vim-repeat'
+Plugin 'tpope/vim-commentary'
 Plugin 'gmarik/vundle'
 Plugin 'LaTeX-Box-Team/latex-box'
-Plugin 'fugitive.vim'
 Plugin 'gregsexton/gitv'
 Plugin 'UltiSnips'
 Plugin 'kien/ctrlp.vim'
-Plugin 'tpope/vim-surround'
-Plugin 'tpope/vim-obsession'
-Plugin 'tpope/vim-sensible'
-Plugin 'tpope/vim-scriptease'
 Plugin 'scrooloose/nerdtree'
 Plugin 'tommcdo/vim-exchange'
 Plugin 'unimpaired.vim'
 Plugin 'Tabular'
-Plugin 'tComment'
 Plugin 'Gundo'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'honza/vim-snippets'