X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Ftmux.conf;h=57e866cfb82df9ba7b45af9bc7b43bbb7f17c46c;hb=49c58e1b7c4a579bd2ec025e4a3440ddc9edf59a;hp=436d99cbd05af38ee021de8afffa7a02fc9bd4e9;hpb=4e168183d06ad03c0b5a32039d6fa36934e5ade0;p=grml-etc-core.git

diff --git a/etc/tmux.conf b/etc/tmux.conf
index 436d99c..57e866c 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -16,7 +16,7 @@ unbind space
 bind-key space next-window
 bind-key C-space next-window
 bind-key K confirm-before kill-pane
-bind-key \ confirm-before kill-session
+bind-key '\' confirm-before kill-session
 #bind-key C-h previous-window
 
 ### join the last active pane to the currently active window
@@ -26,7 +26,7 @@ bind-key j join-pane -s !
 bind-key B if-shell "! tmux has-session -t bg" "new-session -d -s bg" \; move-window -t bg
 
 ### Reload Config
-bind-key R source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+bind-key R source-file ~/.tmux.conf \; source-file -q ~/.tmux.conf.local \; display-message "~/.tmux.conf[.local] reloaded"
 
 ###rebind keys
 bind-key h next-layout
@@ -41,14 +41,11 @@ bind-key - command-prompt -p "exec:" "split-window -v '%%'"
 set -s escape-time 0
 set -g default-terminal "screen-256color"
 set -g display-panes-time 3000
-set -g mouse-select-pane off
 set -g visual-activity on
 set -g mode-keys vi
 
 ### set status line appearance
-set -g status-utf8 on
-set -g status-fg white
-set -g status-bg black
+set -g status-style fg=white,bg=black
 
 set -g status-left-length 28
 ### status-left:  @hostname:sessionname
@@ -63,7 +60,8 @@ set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
 #set -g status-right-length 6
 #set -g status-right "#[fg=yellow]%H:%M"
 
-set-window-option -g window-status-fg blue
-set-window-option -g window-status-bg black
-set-window-option -g window-status-current-attr bold
+set-window-option -g window-status-style fg=blue,bg=black
+set-window-option -g window-status-current-style bold
 
+### source user-specific local configuration file
+source-file -q ~/.tmux.conf.local