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

diff --git a/etc/tmux.conf b/etc/tmux.conf
index ea20b33..a1ea76d 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -30,7 +30,8 @@ bind-key J join-pane
 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 \; source-file -q ~/.tmux.conf.local \; display-message "~/.tmux.conf[.local] 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
@@ -68,4 +69,5 @@ 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
+if-shell "! (env | grep -q TMUX=/tmp/tmate)" \
+  "source-file -q ~/.tmux.conf.local"