diff --git a/dot_tmux.conf b/dot_tmux.conf
new file mode 100644
index 0000000..0e73b09
--- /dev/null
+++ b/dot_tmux.conf
@@ -0,0 +1,21 @@
+set-option -g default-shell /usr/bin/fish
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+
+# nested tmux, obey me
+bind-key a send-prefix
+
+# Avoid the annoying bit of delay when using the control character
+set -g escape-time 0
+set -g renumber-windows on
+
+# Show a visual bell, even on other windows
+set-window-option -g visual-bell both
+set-window-option -g bell-action other
+
+# Set up the window visuals
+set -g window-status-style bg=yellow
+set -g window-status-current-style bg=red,fg=white
diff --git a/private_dot_config/tmux/tmux.conf b/private_dot_config/tmux/tmux.conf
index ae30a06..0e73b09 100644
--- a/private_dot_config/tmux/tmux.conf
+++ b/private_dot_config/tmux/tmux.conf
@@ -1,4 +1,4 @@
-set-option -g default-command fish
+set-option -g default-shell /usr/bin/fish
 
 bind-key h select-pane -L
 bind-key j select-pane -D