From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Nov 2022 14:33:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/152'
X-Git-Tag: v0.19.5~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=330bb70cb5074d46e491e656852605378a53c214;hp=acf8cd2a2be0f48e7942c36cc6bd6aa0480c552e;p=grml-etc-core.git

Merge remote-tracking branch 'origin/github/pr/152'
---

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"