update vundle, update tmux and vimrc to allow cross-split navigation

This commit is contained in:
Haak Saxberg 2014-03-21 16:59:55 -07:00
parent 4d870a9a9c
commit f224133df2
3 changed files with 9 additions and 8 deletions

View file

@ -35,3 +35,10 @@ set -g mouse-select-window on
# big scrollback # big scrollback
set -g history-limit 10240 set -g history-limit 10240
# smart pane switching with awareness of vim splits
bind -n C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"
bind -n C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
bind -n C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
bind -n C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
bind -n C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"

@ -1 +1 @@
Subproject commit 2d2690e41f875466b7de06f93e7ff93b8c50a9af Subproject commit eb5ae19ad67c33565b18301fcdc2cf0fa7184522

View file

@ -34,7 +34,7 @@ Bundle 'maxbrunsfeld/vim-yankstack'
Bundle 'tpope/vim-surround' Bundle 'tpope/vim-surround'
Bundle 'scrooloose/syntastic' Bundle 'scrooloose/syntastic'
Bundle 'Valloric/YouCompleteMe' Bundle 'Valloric/YouCompleteMe'
Bundle 'christoomey/vim-tmux-navigator'
filetype plugin indent on " required filetype plugin indent on " required
""" end vundle """ end vundle
@ -214,12 +214,6 @@ map \q :q<CR>
map \w :w<CR> map \w :w<CR>
noremap Q <nop> noremap Q <nop>
" Easy window navigation
map <C-h> <C-w>h
map <C-j> <C-w>j
map <C-k> <C-w>k
map <C-l> <C-w>l
" Dont reset cursor to start of line when moving around. " Dont reset cursor to start of line when moving around.
set nostartofline set nostartofline
" minimal number of lines to keep above/below cursorline " minimal number of lines to keep above/below cursorline