summaryrefslogtreecommitdiff
path: root/plugins/tmux
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/tmux')
-rw-r--r--plugins/tmux/tmux.plugin.zsh37
1 files changed, 33 insertions, 4 deletions
diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh
index cc676cb92..a2f36c0be 100644
--- a/plugins/tmux/tmux.plugin.zsh
+++ b/plugins/tmux/tmux.plugin.zsh
@@ -1,12 +1,41 @@
# Configuration variables
# Automatically start tmux
-[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART = false
+[[ -n "$ZSH_TMUX_AUTOSTART" ]] || ZSH_TMUX_AUTOSTART=false
# Automatically connect to a previous session if it exists
-[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT = true
+[[ -n "$ZSH_TMUX_AUTOCONNECT" ]] || ZSH_TMUX_AUTOCONNECT=true
# Automatically close the terminal when tmux exits
-[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT = true
+[[ -n "$ZSH_TMUX_AUTOQUIT" ]] || ZSH_TMUX_AUTOQUIT=$ZSH_TMUX_AUTOSTART
# Set term to screen or screen-256color based on current terminal support
-[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT = true
+[[ -n "$ZSH_TMUX_FIXTERM" ]] || ZSH_TMUX_AUTOCONNECT=true
# Get the absolute path to the current directory
local zsh_tmux_plugin_path="$(cd "$(dirname "$0")" && pwd)"
+
+# Local variable to store the local config file to use, if any.
+local fixed_config=""
+
+# Set the correct local config file to use
+if [[ "$ZSH_TMUX_FIXTERM" == "true" ]]
+then
+ if [[ -f $HOME/.tmux.conf || -h $HOME/.tmux.conf ]]
+ then
+ fixed_config=$zsh_tmux_plugin_path/tmux.extra.conf
+ else
+ fixed_config=$zsh_tmux_plugin_path/tmux.only.conf
+ fi
+fi
+
+# Override tmux with our function
+function zsh_tmux_plugin_start()
+{
+ if [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]]
+ then
+ \tmux attach || tmux -f $fixed_config new-session
+ [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+ else
+ \tmux -f $fixed_config
+ [[ "$ZSH_TMUX_AUTOQUIT" == "true" ]] && exit
+ fi
+}
+
+alias tmux=zsh_tmux_plugin_start