diff --git a/zsh/zplug b/zsh/zplug index 17d91a6..2c2f446 100644 --- a/zsh/zplug +++ b/zsh/zplug @@ -2,13 +2,6 @@ source ${ZPLUG_HOME}/init.zsh -zstyle ':tmux:auto-start' local 'yes' -zstyle ':tmux:auto-start' name 'tmux' -zplug "${ZDIR}/modules/tmux/", \ - from:local, \ - defer:0, \ - as:plugin - zplug "zdharma/fast-syntax-highlighting", \ as:plugin, \ defer:2 @@ -36,8 +29,6 @@ zplug "zdharma/zsh-diff-so-fancy", \ as:command, \ use:"bin/{git-dsf,diff-so-fancy}" -FZF_TMUX=1 -FZF_TMUX_HEIGHT=30% zplug "${ZDIR}/modules/fzf/", \ from:local, \ use:"fzf.zsh", \ diff --git a/zsh/zshenv b/zsh/zshenv index 93902da..47d4ac0 100644 --- a/zsh/zshenv +++ b/zsh/zshenv @@ -18,9 +18,17 @@ export PAGER='less' # Remove -X and -F (exit if the content fits on one screen) to enable it. export LESS='-F -g -i -M -R -S -w -X -z-4' + +# Set tmux profile default values. +zstyle ':tmux:auto-start' local 'yes' +zstyle ':tmux:auto-start' name 'tmux' + +# FZF tmux properties. +FZF_TMUX=1 +FZF_TMUX_HEIGHT=30% + # This will load the specified zsh files if they exist in the $ZDIR/env directory. # It will load based on hostname & uname. - env_loader(){ [ -e ${ZDIR}/env/$OSTYPE/$1 ] && source ${ZDIR}/env/$OSTYPE/$1 [ -e ${ZDIR}/env/$HOST/$1 ] && source ${ZDIR}/env/$HOST/$1 diff --git a/zsh/zshrc b/zsh/zshrc index aa5dbb5..271cbc8 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,5 +1,6 @@ # vim: syn=zsh +source "${ZDIR}/modules/tmux/init.zsh" source $ZDIR/zplug env_loader zshrc