X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/372276b7c479d6d988a881b9b7ef29206e3c391b..79d4a3561fa6b4bc80d75d8f9940139c2437df36:/base/.zshenv?ds=sidebyside

diff --git a/base/.zshenv b/base/.zshenv
index 46b0e66..7787a93 100644
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,44 +1,18 @@
-### path
-# /usr/{pkg,local,games} are unix/bsdisms
-typeset -U path
-path=({~/,/,/usr/}sbin {~/,/,/usr/}bin /usr/pkg/{s,}bin /usr/X11R{7,6}/bin
-      /usr/local/{s,}bin /usr/games $path)
+# load site-specific
+[[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 
-### posix
-export EDITOR=vim
-export PAGER=less
-export GREP_OPTIONS=--color=auto
-export LANG="en_US.UTF-8"
-export LC_CTYPE="$LANG"
-
-### xdg
-export XDG_CONFIG_HOME=~/etc
-export XDG_CONFIG_DIRS=~/.config:/usr/pkg/etc/xdg:/usr/local/etc/xdg:/etc/xdg
-export XDG_DATA_HOME=~/share
-export XDG_DATA_DIRS=~/.local/share:/usr/pkg/share:/usr/local/share:/usr/share
-export XDG_CACHE_HOME=~/tmp
-export XDG_RUNTIME_DIR=~/tmp
-
-### applications
-export PYTHONSTARTUP=~/.pythonrc
-## perl
-(( ${+commands[perl]} )) && eval $(perl -I $XDG_DATA_HOME/perl5/lib/perl5 -Mlocal::lib=$XDG_DATA_HOME/perl5)
-## gpg
-export GPG_TTY=$(tty)
-if [[ ! -v SSH_AUTH_SOCK ]] {
-	# set up SSH auth socket and start GPG agent
-	export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+# 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
+    }
 }
-gpg-connect-agent updatestartuptty /bye >/dev/null
+export _sev_olduser=$USERNAME
 
-### freebsd
-if [[ "$OSTYPE" =~ "^freebsd" ]] {
-	export CLICOLOR=
-	export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=46;34:cd=43;34:su=41;30:sg=46;30:tw=42;30:ow=43;30'
-}
-
-### load site-specific
-if [[ -f ~/.zshenv.local ]] && [[ ! -v _ZSHENV_LOADED ]] {
-	export _ZSHENV_LOADED=
-	source ~/.zshenv.local
-}
+# vim: et sts=4 sw=4 ts=8 tw=79