X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=blobdiff_plain;f=etc%2Ftmux.conf;fp=etc%2Ftmux.conf;h=57e866cfb82df9ba7b45af9bc7b43bbb7f17c46c;hp=0c55b579da821f1613df87e898ef095b0f41d72f;hb=2060f8d0ec99870896b214215f871d2b86aede2b;hpb=4a3593bce8a535dd6daa7d35267d2dbe04a7a291

diff --git a/etc/tmux.conf b/etc/tmux.conf
index 0c55b57..57e866c 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -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