X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Ftmux.conf;h=57e866cfb82df9ba7b45af9bc7b43bbb7f17c46c;hb=2060f8d0ec99870896b214215f871d2b86aede2b;hp=3c36464dd0036909cd5141b152a2bcdb92175e05;hpb=24e8d3be9f59a015d4292b09beb38ea707a260be;p=grml-etc-core.git

diff --git a/etc/tmux.conf b/etc/tmux.conf
index 3c36464..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
@@ -62,3 +62,6 @@ set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
 
 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