1 files changed, 12 insertions, 33 deletions
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index bdefdd2..aaa8fb8 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -94,47 +94,26 @@ bind -n M-0 select-window -t :=0
 
 # 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|l?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'
-#
-#tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
-#if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
-#  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
-#if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
-#  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
-#
-## Copy Mode vi-directional keys
-#bind-key -T copy-mode-vi 'C-h' select-pane -L
-#bind-key -T copy-mode-vi 'C-j' select-pane -D
-#bind-key -T copy-mode-vi 'C-k' select-pane -U
-#bind-key -T copy-mode-vi 'C-l' select-pane -R
-#bind-key -T copy-mode-vi 'C-\' select-pane -l
-
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?)(diff)?$'"
 
-# Key binding for navigating between panes in the outer tmux session
-bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'if-shell -F "#{pane_in_nested}" "select-pane -L" "select-pane -L; select-window -t =%"'
-
-bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'if-shell -F "#{pane_in_nested}" "select-pane -D" "select-pane -D; select-window -t =%"'
-bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'if-shell -F "#{pane_in_nested}" "select-pane -U" "select-pane -U; select-window -t =%"'
-bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'if-shell -F "#{pane_in_nested}" "select-pane -R" "select-pane -R; select-window -t =%"'
+bind-key -n 'C-h' if-shell "$is_vim" 'send-keys -t=+ C-h' 'if-shell -F '#{pane_in_zoom}' "break-pane" "send-keys -t=+ select-pane -L"'
+bind-key -n 'C-j' if-shell "$is_vim" 'send-keys -t=+ C-j' 'if-shell -F '#{pane_in_zoom}' "break-pane" "send-keys -t=+ select-pane -D"'
+bind-key -n 'C-k' if-shell "$is_vim" 'send-keys -t=+ C-k' 'if-shell -F '#{pane_in_zoom}' "break-pane" "send-keys -t=+ select-pane -U"'
+bind-key -n 'C-l' if-shell "$is_vim" 'send-keys -t=+ C-l' 'if-shell -F '#{pane_in_zoom}' "break-pane" "send-keys -t=+ select-pane -R"'
+bind-key -n 'C-\' if-shell "$is_vim" 'send-keys -t=+ C-\' 'if-shell -F '#{pane_in_zoom}' "break-pane" "send-keys -t=+ select-pane -l"'
 
 tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
 if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
-  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'if-shell -F \"#{pane_in_nested}\" \"select-pane -l\" \"select-pane -l; select-window -t =%\"'"
+  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
 if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
-  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'if-shell -F \"#{pane_in_nested}\" \"select-pane -l\" \"select-pane -l; select-window -t =%\"'"
+  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
 
 # Copy Mode vi-directional keys
-bind-key -T copy-mode-vi 'C-h' if-shell -F "#{pane_in_nested}" "select-pane -L" "select-pane -L; select-window -t =%"
-bind-key -T copy-mode-vi 'C-j' if-shell -F "#{pane_in_nested}" "select-pane -D" "select-pane -D; select-window -t =%"
-bind-key -T copy-mode-vi 'C-k' if-shell -F "#{pane_in_nested}" "select-pane -U" "select-pane -U; select-window -t =%"
-bind-key -T copy-mode-vi 'C-l' if-shell -F "#{pane_in_nested}" "select-pane -R" "select-pane -R; select-window -t =%"
-#bind-key -T copy-mode-vi 'C-\\' if-shell -F "#{pane_in_nested}" "select-pane -l" "select-pane -l; select-window -t =%"
+bind-key -T copy-mode-vi 'C-h' select-pane -L
+bind-key -T copy-mode-vi 'C-j' select-pane -D
+bind-key -T copy-mode-vi 'C-k' select-pane -U
+bind-key -T copy-mode-vi 'C-l' select-pane -R
+bind-key -T copy-mode-vi 'C-\' select-pane -l
 
 # Change horizontal split <Prefix>% and Vertical split <Prefix>" to <Prefix>h and <Prefix>v respectively and change current working directory
 bind v split-window -h -c "#{pane_current_path}"