.

2 files changed, 59 insertions, 46 deletions

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
deleted file mode 100644
index 60ce1c0..0000000
--- a/tmux/.tmux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-set -g escape-time 0
-
-set -g prefix C-a
-bind C-a send-prefix
-unbind C-b
-
-set -g set-clipboard on
-
-setw -g base-index 1
-
-setw -g mode-keys vi
-
-set -g default-terminal "screen-256color"
-set -g default-command /bin/zsh
-
-set -g mouse on
-
-bind-key -n 'C-M-Left'      prev
-bind-key -n 'C-M-Right'     next
-bind-key -n 'C-M-Up'        new-window
-bind-key -n 'C-M-Down'      confirm-before -p "kill-window #W? (y/n)" kill-window
-
-bind-key -n 'C-M-h'         prev
-bind-key -n 'C-M-l'         next
-bind-key -n 'C-M-k'         new-window
-bind-key -n 'C-M-j'         confirm-before -p "kill-window #W? (y/n)" kill-window
-
-#bind-key -n 'C-M-\\'        split-window -h
-#bind-key -n 'C-M-\-'        split-window
-bind-key -n 'C-M-x'         confirm-before -p "kill-pane #P? (y/n)" kill-pane
-
-
-set -g status-style "fg=black,bg=colour34"
-bind-key 'Up' select-pane -P 'fg=white,bg=black'
-bind-key 'Down' select-pane -P 'fg=black,bg=white'
-
-set -g status-right "%Y-%m-%d %H:%M"
-
-bind-key ] run "sh ~/.dotfiles/tmux/paste.sh"
-
-
-set -g @plugin 'christoomey/vim-tmux-navigator'
-
-if "test ! -d ~/.tmux/plugins/tpm" \
-   "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'"
-run -b '~/.tmux/plugins/tpm/tpm'
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
new file mode 100644
index 0000000..9a5c623
--- /dev/null
+++ b/tmux/tmux.conf
@@ -0,0 +1,59 @@
+set -g escape-time 0
+
+set -g prefix C-a
+bind C-a send-prefix
+unbind C-b
+
+set -g set-clipboard on
+
+setw -g base-index 1
+
+setw -g mode-keys vi
+
+set -g default-terminal "screen-256color"
+set -g default-command /bin/zsh
+
+set -g mouse on
+
+bind-key -n 'C-M-Left'      prev
+bind-key -n 'C-M-Right'     next
+bind-key -n 'C-M-Up'        new-window
+bind-key -n 'C-M-Down'      confirm-before -p "kill-window #W? (y/n)" kill-window
+
+bind-key -n 'C-M-h'         prev
+bind-key -n 'C-M-l'         next
+bind-key -n 'C-M-k'         new-window
+bind-key -n 'C-M-j'         confirm-before -p "kill-window #W? (y/n)" kill-window
+
+#bind-key -n 'C-M-\\'        split-window -h
+#bind-key -n 'C-M-\-'        split-window
+bind-key -n 'C-M-x'         confirm-before -p "kill-pane #P? (y/n)" kill-pane
+
+
+set -g status-style "fg=black,bg=colour34"
+bind-key 'Up' select-pane -P 'fg=white,bg=black'
+bind-key 'Down' select-pane -P 'fg=black,bg=white'
+
+set -g status-right "%Y-%m-%d %H:%M"
+
+bind-key ] run "sh ~/.config/tmux/paste.sh"
+
+
+# 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'"
+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