Skip to content

Commit

Permalink
Revert "Add vim-tmux-navigator"
Browse files Browse the repository at this point in the history
Turns out that this of course breaks ctrl-h as a backspace key, which I
use all the time.

This reverts commit e95da22.
  • Loading branch information
evantravers committed Jun 17, 2016
1 parent e95da22 commit 49fa3ba
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
1 change: 0 additions & 1 deletion .config/nvim/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Plug '1995eaton/vim-better-javascript-completion', { 'for' : 'javascript' }
Plug 'AndrewRadev/gapply.vim'
Plug 'Raimondi/delimitMate'
Plug 'SirVer/ultisnips'
Plug 'christoomey/vim-tmux-navigator'
Plug 'StanAngeloff/php.vim', { 'for' : 'php' }
Plug 'Wolfy87/vim-enmasse'
Plug 'airblade/vim-gitgutter'
Expand Down
14 changes: 5 additions & 9 deletions .tmux.osx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,11 @@ set -g prefix C-_

setw -g mode-keys vi

# Smart pane switching with awareness of Vim splits.
# See: https://github.com/christoomey/vim-tmux-navigator
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
# Act like vim for selecting panes
bind h select-pane -L
bind j select-pane -D
bind k select-pane -U
bind l select-pane -R

# Start at 1 rather than 0
set -g base-index 1
Expand Down
1 change: 0 additions & 1 deletion .vimrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Plug '1995eaton/vim-better-css-completion', { 'for' : 'css' }
Plug '1995eaton/vim-better-javascript-completion', { 'for' : 'javascript' }
Plug 'AndrewRadev/gapply.vim'
Plug 'Raimondi/delimitMate'
Plug 'christoomey/vim-tmux-navigator'
Plug 'SirVer/ultisnips'
Plug 'StanAngeloff/php.vim', { 'for' : 'php' }
Plug 'Wolfy87/vim-enmasse'
Expand Down

0 comments on commit 49fa3ba

Please sign in to comment.