X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Ftmux.conf;h=ea20b33b153ca89f9a3af9c35dd9af759f5dbec6;hb=HEAD;hp=f74f7b9897c2f5f1267b666b343ef116e48edf75;hpb=a5eb2feca052396d5b923979118f68f626ac9d69;p=grml-etc-core.git

diff --git a/etc/tmux.conf b/etc/tmux.conf
index f74f7b9..a1ea76d 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -16,17 +16,22 @@ 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
 bind-key j join-pane -s !
 
+### join the marked pane to the currently active window
+### ('bind-key m select-pane -m' is default to mark the current pane)
+bind-key J join-pane
+
 ### Move current window to session named "bg" (and create session if it does not exist)
 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"
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+  "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
@@ -45,8 +50,7 @@ set -g visual-activity on
 set -g mode-keys vi
 
 ### set status line appearance
-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
@@ -61,7 +65,9 @@ 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
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+  "source-file -q ~/.tmux.conf.local"