From b88282a451a3c1b7275ead4d230cd1d08950523f Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Tue, 4 Nov 2014 10:21:02 -0800 Subject: [PATCH] Update vim-settings and add tmux-navigator and tmux-line support --- assets/default/dotfiles/tmux.conf | 9 +++++++++ assets/default/vim-settings | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/assets/default/dotfiles/tmux.conf b/assets/default/dotfiles/tmux.conf index 7c4e524..6e0e82f 100644 --- a/assets/default/dotfiles/tmux.conf +++ b/assets/default/dotfiles/tmux.conf @@ -62,3 +62,12 @@ bind -t vi-copy y copy-selection if-shell 'test "$(uname -s)" = "Darwin"' 'bind-key y run "tmux show-buffer | reattach-to-user-namespace pbcopy"' if-shell 'test "$(uname -s)" = "Linux"' 'bind-key y run "tmux show-buffer | xclip -sel clip -i"' +# Auto load tmuxline config for themes +if-shell "test -f ~/.tmuxline.conf" "source ~/.tmuxline.conf" + +# 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" diff --git a/assets/default/vim-settings b/assets/default/vim-settings index e0e4f2c..270f8f9 160000 --- a/assets/default/vim-settings +++ b/assets/default/vim-settings @@ -1 +1 @@ -Subproject commit e0e4f2c17f04faec547cff81d60ede6b3b0fc0a1 +Subproject commit 270f8f929b30e2763686f3bf68e2a3df5ef176d4