diff --git a/.tmux.conf b/.tmux.conf
deleted file mode 100644
index e2a700c..0000000
--- a/.tmux.conf
+++ /dev/null
@@ -1,58 +0,0 @@
-# Make sure tmux use zsh
-set -g default-shell /usr/bin/zsh
-set -g default-command /usr/bin/zsh
-
-# Enable mouse control (clickable windows, panes, resizable panes)
-set -g mouse on
-
-# I don't like ctrl+b
-set -g prefix C-x
-
-# Unbind the default Ctrl+b
-unbind C-b
-# Ensure we can still send Ctrl+x to applications (by pressing it twice)
-bind C-x send-prefix
-
-bind b previous-window
-
-# DESIGN TWEAKS
-
-# don't do anything when a 'bell' rings
-set -g visual-activity off
-set -g visual-bell off
-set -g visual-silence off
-setw -g monitor-activity off
-set -g bell-action none
-
-# clock mode
-setw -g clock-mode-colour yellow
-
-# copy mode
-setw -g mode-style 'fg=black bg=red bold'
-
-# panes
-set -g pane-border-style 'fg=red'
-set -g pane-active-border-style 'fg=yellow'
-
-# statusbar
-set -g status-position bottom
-set -g status-justify left
-set -g status-style 'fg=green'
-
-set -g status-left ''
-set -g status-left-length 10
-
-set -g status-right-style 'fg=white bg=default'
-set -g status-right '%d %b %H:%M'
-set -g status-right-length 25
-
-setw -g window-status-current-style 'fg=green bg=default'
-setw -g window-status-current-format ' #I #W #F '
-
-setw -g window-status-style 'fg=white bg=default'
-setw -g window-status-format ' #I #[fg=white]#W #[fg=yellow]#F '
-
-setw -g window-status-bell-style 'fg=yellow bg=red bold'
-
-# messages
-set -g message-style 'fg=yellow bg=red bold'
diff --git a/.zshrc b/.zshrc
index dd0bdbe..f271296 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,3 @@
-if [ -z "$TMUX" ] && [ -n "$PS1" ]; then
-  exec tmux
-fi
 export ZSH="$HOME/.oh-my-zsh"
 
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes