diff --git a/tmux.conf b/tmux.conf
index 4fc799e..2f46465 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -16,33 +16,16 @@ unbind C-b
 set -g prefix C-a
 bind C-a send-prefix
 
-#
-# Smart pane switching with awareness of Vim splits.
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-  | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
+# window switching
+bind -n C-h select-window -t:-
+bind -n C-l select-window -t:+
 
-is_fzf="ps -o state= -o comm= -t '#{pane_tty}' \
-  | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?fzf$'"
-
-bind -n C-h run "($is_vim && tmux send-keys C-h) || \
-                 tmux select-pane -L"
-
-bind -n C-j run "($is_vim && tmux send-keys C-j) || \
-                 ($is_fzf && tmux send-keys C-j) || \
-                 tmux select-pane -D"
-
-bind -n C-k run "($is_vim && tmux send-keys C-k) || \
-                 ($is_fzf && tmux send-keys C-k) || \
-                 tmux select-pane -U"
-
-bind -n C-l run "($is_vim && tmux send-keys C-l) || \
-                 tmux select-pane -R"
-
-bind-key -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
-
-# Setup 'v' to begin selection as in Vim
-bind-key -t vi-copy v begin-selection
-bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
+# smart pane switching with awareness of vim splits
+bind -nr C-h run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-h) || tmux select-pane -L"
+bind -nr C-j run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-j) || tmux select-pane -D"
+bind -nr C-k run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-k) || tmux select-pane -U"
+bind -nr C-l run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys C-l) || tmux select-pane -R"
+bind -nr C-\ run "(tmux display-message -p '#{pane_current_command}' | grep -iq vim && tmux send-keys 'C-\\') || tmux select-pane -l"
 
 # splitting panes
 bind | split-window -h