X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/f520c79a5934091c5676b6384e225e56e580a033..e0e92e9bb91b49a93b8152d3e02cd53be3830991:/base/.zshenv diff --git a/base/.zshenv b/base/.zshenv index 18b4552..1f3e198 100644 --- a/base/.zshenv +++ b/base/.zshenv @@ -37,24 +37,26 @@ if [[ -v _sev_reset_shell || $SHLVL == 1 ]] { export XDG_DATA_DIRS=~/.local/share:/usr/pkg/share:/usr/local/share:/usr/share export XDG_CACHE_HOME=~/tmp export XDG_RUNTIME_DIR=~/tmp + if [[ -e $XDG_CONFIG_HOME/user-dirs.dirs ]] { + source $XDG_CONFIG_HOME/user-dirs.dirs + } ## create tmp link t=${TMPDIR:-/tmp}/home-$LOGNAME - h=$HOME/tmp if [[ ! -e $t ]] { mkdir -m 700 $t >/dev/null 2>&1 # TODO: check if dir exists after mkdir } # allow opaque entries to override link creation - if [[ ! -e $h ]] { - ln -sf $t $h >/dev/null 2>&1 + if [[ ! -e $XDG_RUNTIME_DIR ]] { + ln -sf $t $XDG_RUNTIME_DIR >/dev/null 2>&1 } - unset t h + unset t ## ssh agents # NOTE: preferred order of agents to check: okcagent, gnupg, openssh # first block takes care of okcagent and openssh, second gnupg - print -nP "%F{blue}>>>%f SSH: %F{green}" + [[ -o interactive ]] && print -nP "%F{blue}>>>%f SSH: %F{green}" if [[ ! -v SSH_AUTH_SOCK && ( -v commands[okc-ssh-agent] || ( -v commands[ssh-agent] && ! -v commands[gpg] ) ) ]] { okc=${commands[okc-ssh-agent]:+okc-}