Skip to content

GitLab

Commit 55f79906 authored by Andrew Schwartzmeyer's avatar Andrew Schwartzmeyer
Browse files

Not loading home tmux confs when iTerm2 tmux integration is enabled

parent bc654437
Show whitespace changes
Inline Side-by-side
plugins/tmux/tmux.plugin.zsh
View file @ 55f79906
...@@ -38,7 +38,7 @@ if which tmux &> /dev/null ...@@ -38,7 +38,7 @@ if which tmux &> /dev/null
fi fi
# Set the correct local config file to use. # Set the correct local config file to use.
if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]] if [[ "$ZSH_TMUX_ITERM2" == "false" ]] && (( [[ -f $HOME/.tmux.conf ]] || -h $HOME/.tmux.conf ]] ))
then then
#use this when they have a ~/.tmux.conf #use this when they have a ~/.tmux.conf
export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf" export _ZSH_TMUX_FIXED_CONFIG="$zsh_tmux_plugin_path/tmux.extra.conf"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment