zprofile: always prefer user bin dirs

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 7787a934df3697fd6120c99051a40ed0e73714c4..5142322e8549e8f04338de0dc7575ddd4bad9794 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,18 +1,33 @@
-# load site-specific
+### load site-specific

 [[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 
 [[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 

-# 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
+### fix broken term
+if [[ -o interactive && $#terminfo -eq 0 ]] {
+    _oldterm=$TERM
+    TERM=xterm-256color >/dev/null 2>&1
+    print -P "%F{red}!!! Can't find terminfo for $_oldterm, using $TERM%f"
+    unset _oldterm
+}
+
+if [[ -o login ]] {
+    ### cd on login shell for convenience
+    cd ~
+} else {
+    if [[ ! -v _sev_first_display && ( -v DISPLAY || -v WAYLAND_DISPLAY ) ]] {
+        # this is to allow gpg and pinentry env to be updated
+        # XXX: will be sourced by every new child shell if zsh is not used to
+        #      start the graphical session, but since .zprofile is light that
+        #      shouldn't cause a noticeable performance impact
+        # NOTE: above happens with sway without a display manager or launcher
+        export _sev_first_display=
+        source ${ZDOTDIR:-~}/.zprofile
+        export _sev_first_display=0

     } elif [[ $SHLVL == 1 ]] {
     } 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
+        ### early zprofile sourcing for first shell
+        # NOTE: ensure profile is loaded for toplevel shells; should hopefully be 1
+        #       under some Xorg or cron implementations, which is where this would be most useful

         source ${ZDOTDIR:-~}/.zprofile
     }
 }
         source ${ZDOTDIR:-~}/.zprofile
     }
 }

-export _sev_olduser=$USERNAME

 
 # vim: et sts=4 sw=4 ts=8 tw=79
 
 # vim: et sts=4 sw=4 ts=8 tw=79