in development

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 2ed1fc88703b8753892e607a705426ad600b05d8..7787a934df3697fd6120c99051a40ed0e73714c4 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,4 +1,18 @@
-### load site-specific
-if [[ -f ~/.zshenv.local ]] { source ~/.zshenv.local }
+# load site-specific
+[[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 
-# vim: set et sts=4 sw=4 ts=8 tw=79 :
+# 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 _sev_olduser=$USERNAME
+
+# vim: et sts=4 sw=4 ts=8 tw=79