From 93b8fe4dfe5ad2d4171acc8b38107ad7a695036e Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 31 Jul 2012 09:12:40 +1200
Subject: Regroup tmux config

This way I only have to run that terminal color test once, and it's much
tidier overall. Also removed a couple features I never use.
---
 tmux/tmux.conf | 57 +++++++++++++--------------------------------------------
 1 file changed, 13 insertions(+), 44 deletions(-)

(limited to 'tmux/tmux.conf')

diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 711a864d..753665aa 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -17,7 +17,7 @@ bind-key -r '-' resize-pane -D 5
 bind-key -r '<' resize-pane -L 5
 bind-key -r '>' resize-pane -R 5
 
-# Vim-like copy paste
+# Vim-like select/yank
 bind-key -t vi-copy 'v' begin-selection
 bind-key -t vi-copy 'y' copy-selection
 
@@ -27,56 +27,25 @@ bind-key j select-pane -D
 bind-key k select-pane -U
 bind-key l select-pane -R
 
-# Vim-like pane swapping
-bind-key J swap-pane -D
-bind-key K swap-pane -U
-
 # Activity
 set-window-option -g monitor-activity on
 set-window-option -g window-status-activity-attr none
-if-shell 'test `tput colors` -eq 256' 'set-window-option -g window-status-activity-bg colour237'
-if-shell 'test `tput colors` -eq 256' 'set-window-option -g window-status-activity-fg colour248'
-
-# Clipboard
-set-option -g set-clipboard off
-
-# History
-set-option -g history-limit 100000
-
-# Indices
-set-option -g base-index 1
-
-# Messages
-if-shell 'test `tput colors` -eq 256' 'set-option -g message-bg colour18'
-if-shell 'test `tput colors` -eq 256' 'set-option -g message-fg colour231'
-
-# Modes
-set-window-option -g mode-keys vi
-if-shell 'test `tput colors` -eq 256' 'set-window-option -g mode-bg colour18'
-if-shell 'test `tput colors` -eq 256' 'set-window-option -g mode-fg colour231'
-
-# Pane borders
-if-shell 'test `tput colors` -eq 256' 'set-option -g pane-active-border-bg colour237'
-if-shell 'test `tput colors` -eq 256' 'set-option -g pane-active-border-fg colour237'
-if-shell 'test `tput colors` -eq 256' 'set-option -g pane-border-bg colour237'
-if-shell 'test `tput colors` -eq 256' 'set-option -g pane-border-fg colour237'
-
-# Resize
-set-window-option -g aggressive-resize on
 
 # Status bar
 set-option -g status-left '[#S]'
 set-option -g status-right '[#H] #(date +"%F %T")'
-if-shell 'test `tput colors` -eq 256' 'set-option -g status-bg colour237'
-if-shell 'test `tput colors` -eq 256' 'set-option -g status-fg colour248'
-if-shell 'test `tput colors` -eq 256' 'set-window-option -g window-status-current-format "#[fg=colour231]#I:#W#F"'
-if-shell 'test `tput colors` -eq 256' 'set-window-option -g window-status-format "#[fg=colour16]#I:#W#F"'
-
-# Terminal
-CONTAINING_TERM=$TERM
-set-option -s escape-time 0
-if-shell 'test `tput colors` -eq 256' 'set-option -g default-terminal "screen-256color"'
 
-# Titles
+# Miscellaneous
+set-option -g base-index 1
+set-option -g escape-time 0
+set-option -g history-limit 100000
+set-option -g set-clipboard off
+set-window-option -g aggressive-resize on
 set-window-option -g automatic-rename off
+set-window-option -g mode-keys vi
+
+# Terminal handling
+CONTAINING_TERM=$TERM
+if-shell 'test -e ~/.tmux.conf.256 && test `tput colors` -eq 256' \
+    'source ~/.tmux.conf.256'
 
-- 
cgit v1.2.3