Andrew Schwartzmeyer <andrew.schwartzmeyer@gmail.com>
Committer
Andrew Schwartzmeyer <andrew.schwartzmeyer@gmail.com>
Date
Message
Not loading home tmux confs when iTerm2 tmux integration is enabled
Diff
1diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
2index 5bd946f0895b556e8d6ff31eb493361775e863ac..049ceb30f8982e601c311b1fb2683e1d9480acca 100644
3--- a/plugins/tmux/tmux.plugin.zsh
4+++ b/plugins/tmux/tmux.plugin.zsh
5@@ -38,7 +38,7 @@ if which tmux &> /dev/null
6 fi
7 8 # Set the correct local config file to use.
9- if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
10+ if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -f $HOME/.tmux.conf ]] || -h $HOME/.tmux.conf ]] ))
11 then
12 #use this when they have a ~/.tmux.conf
13 export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"