zsh: compact path glob, avoid double source

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 7787a934df3697fd6120c99051a40ed0e73714c4..45ea3392b6130062cb6a8b789d38dcf4aee6099d 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,18 +1,32 @@
-# load site-specific
-[[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
+[[ -v _sev_home ]] || export _sev_home=$HOME
 
-# manually source .zprofile if we're not a login shell and it's a good idea
-# see comments in .zprofile for rationale
-if [[ ! -o login ]] {
-    if [[ -v _sev_olduser && $_sev_olduser != $USERNAME ]] {
-        # set up some user-dependent stuff since we switched users
-        _sev_switched_users= source ${ZDOTDIR:-~}/.zprofile
-    } elif [[ $SHLVL == 1 ]] {
-        # ensure profile is loaded for toplevel shells; should hopefully be 1
-        # under Xorg or cron, which is where this would be most useful
-        source ${ZDOTDIR:-~}/.zprofile
-    }
+export ZDOTDIR=${XDG_CONFIG_HOME:-~/.config}/zsh
+
+### load site-specific
+[[ -f ${ZDOTDIR:-~}/.zshenv.local ]] && source ${ZDOTDIR:-~}/.zshenv.local
+
+### fix broken term
+if [[ ! -v TERM ]] {
+    TERM=xterm-256color >/dev/null 2>&1
+}
+if [[ -o interactive && $#terminfo -eq 0 ]] {
+    _oldterm=$TERM
+    export TERM=xterm >/dev/null 2>&1
+    print -P "%F{red}!!! Can't find terminfo for $_oldterm, using $TERM%f"
+    unset _oldterm
 }
-export _sev_olduser=$USERNAME
 
-# vim: et sts=4 sw=4 ts=8 tw=79
+# NOTE: see .zprofile comment for rationale on sourcing
+if [[ ! -v _sev_first_display && ( -v DISPLAY || -v WAYLAND_DISPLAY ) ]] {
+    ### update gpgagent to use graphical pinentry
+    # XXX: will be sourced by every new child shell if zsh is not used to
+    #      start the graphical session and the _sev_first_display var isn't
+    #      exported; for example, this previously happened with sway without a
+    #      display manager or launcher in front of it
+    export _sev_first_display=
+    _sev_refresh_gpgagent=
+    [[ ! -o login ]] && source ${ZDOTDIR:-~}/.zprofile
+} elif [[ ! -o login && $SHLVL -eq 1 && ${+TERMUX_VERSION} -eq 0 ]] {
+    ### early zprofile sourcing for first shell even if not a login shell
+    source ${ZDOTDIR:-~}/.zprofile
+}