aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinstall1
-rw-r--r--tmux/tmux.conf18
-rw-r--r--tmux/tmux.conf.25615
3 files changed, 14 insertions, 20 deletions
diff --git a/install b/install
index 3fd028eb..b1ff094c 100755
--- a/install
+++ b/install
@@ -12,7 +12,6 @@ ln -fs ".dotfiles/bash/bash_logout" "${HOME}/.bash_logout"
ln -fs ".dotfiles/git/gitconfig" "${HOME}/.gitconfig"
ln -fs ".dotfiles/readline/inputrc" "${HOME}/.inputrc"
ln -fs ".dotfiles/tmux/tmux.conf" "${HOME}/.tmux.conf"
-ln -fs ".dotfiles/tmux/tmux.conf.256" "${HOME}/.tmux.conf.256"
ln -fs ".dotfiles/vim/vimrc" "${HOME}/.vimrc"
ln -fs ".dotfiles/vim/gvimrc" "${HOME}/.gvimrc"
ln -fs ".dotfiles/X/Xdefaults" "${HOME}/.Xdefaults"
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 81e49d33..ce43ad6e 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -47,8 +47,18 @@ set-window-option -g mode-keys vi
# No special xterm stuff, error-prone in VTE
set -ga terminal-overrides ',*:XT@'
-# Terminal handling
-containing_term=$TERM
-if-shell 'test -e ~/.tmux.conf.256 && test `tput colors` -eq 256' \
- 'source ~/.tmux.conf.256'
+# Colors
+set-option -g default-terminal 'screen-256color'
+set-option -g message-bg colour18
+set-option -g message-fg colour231
+set-option -g pane-active-border-fg colour237
+set-option -g pane-border-fg colour237
+set-option -g status-bg colour237
+set-option -g status-fg colour248
+set-window-option -g mode-bg colour18
+set-window-option -g mode-fg colour231
+set-window-option -g window-status-activity-bg colour237
+set-window-option -g window-status-activity-fg colour248
+set-window-option -g window-status-current-format "#[fg=colour231]#I:#W#F"
+set-window-option -g window-status-format "#[fg=colour16]#I:#W#F"
diff --git a/tmux/tmux.conf.256 b/tmux/tmux.conf.256
deleted file mode 100644
index a6529a70..00000000
--- a/tmux/tmux.conf.256
+++ /dev/null
@@ -1,15 +0,0 @@
-# 256 color terminals
-set-option -g default-terminal 'screen-256color'
-set-option -g message-bg colour18
-set-option -g message-fg colour231
-set-option -g pane-active-border-fg colour237
-set-option -g pane-border-fg colour237
-set-option -g status-bg colour237
-set-option -g status-fg colour248
-set-window-option -g mode-bg colour18
-set-window-option -g mode-fg colour231
-set-window-option -g window-status-activity-bg colour237
-set-window-option -g window-status-activity-fg colour248
-set-window-option -g window-status-current-format "#[fg=colour231]#I:#W#F"
-set-window-option -g window-status-format "#[fg=colour16]#I:#W#F"
-