diff --git a/zsh/functions/eval.zsh b/zsh/functions/eval.zsh index 06da4e5..2136402 100755 --- a/zsh/functions/eval.zsh +++ b/zsh/functions/eval.zsh @@ -3,6 +3,12 @@ # -*- mode: sh -*- eval "$(direnv hook zsh)" + +# Load zprezto if it's installed +if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then + source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" +fi + eval "$(aws-vault --completion-script-zsh)" [[ -d "$PYENV_ROOT" ]] && eval "$(pyenv init -)" # eval "$(hub alias -s)" diff --git a/zsh/zshrc b/zsh/zshrc index 3ab4353..5aa84ee 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -3,18 +3,10 @@ umask 077 # Created by dotfiles [[ "$TERM" == "screen" ]] && export TERM=screen-256color -[[ -f ~/.zsh/functions/eval.zsh ]] && source ~/.zsh/functions/eval.zsh # source values +[[ -f ~/.zsh/functions/eval.zsh ]] && source ~/.zsh/functions/eval.zsh # source values for f in $(compaudit);do sudo chmod -R 755 $f;done; -# -# Zprezto -# -# Load zprezto if it's installed -if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then - source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" -fi - # load custom executable functions for function in ~/.zsh/functions/*; do source $function