aboutsummaryrefslogtreecommitdiff
path: root/tmux
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2012-04-27 13:06:26 +1200
committerTom Ryder <tom@sanctum.geek.nz>2012-04-27 13:06:26 +1200
commitd4d9a71de236b195b9f029f0f14f29e3d4a0e1ca (patch)
tree437a8cde9b377449011e62d24b47b20c28cd8745 /tmux
parentRemove -s option from hostname call. (diff)
downloaddotfiles-d4d9a71de236b195b9f029f0f14f29e3d4a0e1ca.tar.gz
dotfiles-d4d9a71de236b195b9f029f0f14f29e3d4a0e1ca.zip
Unify tmux configuration.
The two machines on which I run tmux servers now have at least tmux 1.6, so there's no need for me to provide these version-specific configuration files anymore.
Diffstat (limited to 'tmux')
-rw-r--r--tmux/tmux.conf6
-rw-r--r--tmux/tmux.conf.local.new5
-rw-r--r--tmux/tmux.conf.local.old5
3 files changed, 4 insertions, 12 deletions
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 769cd05b..f2c2e8a5 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -105,6 +105,8 @@ set-window-option -g mode-bg colour18
# Monitor window activity.
set-window-option -g monitor-activity on
-# Source local configuration.
-source-file ~/.tmux.conf.local
+# Use the same colours for windows with alerts.
+set-window-option -g window-status-activity-attr none
+set-window-option -g window-status-activity-fg colour248
+set-window-option -g window-status-activity-bg colour237
diff --git a/tmux/tmux.conf.local.new b/tmux/tmux.conf.local.new
deleted file mode 100644
index 56b06c97..00000000
--- a/tmux/tmux.conf.local.new
+++ /dev/null
@@ -1,5 +0,0 @@
-# Use the same colours for windows with alerts.
-set-window-option -g window-status-activity-attr none
-set-window-option -g window-status-activity-fg colour248
-set-window-option -g window-status-activity-bg colour237
-
diff --git a/tmux/tmux.conf.local.old b/tmux/tmux.conf.local.old
deleted file mode 100644
index 12d746be..00000000
--- a/tmux/tmux.conf.local.old
+++ /dev/null
@@ -1,5 +0,0 @@
-# Use the same colours for windows with alerts.
-set-window-option -g window-status-alert-attr none
-set-window-option -g window-status-alert-fg colour248
-set-window-option -g window-status-alert-bg colour237
-