X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/ff1a2414a9bf713665df692fab9cae9d2320b2f1..456bc1f80b59f8e71ba29e08aedcd24a550aabec:/base/.zshenv

diff --git a/base/.zshenv b/base/.zshenv
index 7c2fe94..a709ce6 100644
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,35 +1,29 @@
-### path
-# typeset -U makes every array entry unique
-# /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)
-
-### 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
+### load site-specific
+[[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
 
-### applications
-export DVTM_TERM=rxvt-unicode
-export PYTHONSTARTUP=~/.pythonrc
+### fix broken term
+if (( $#terminfo == 0 )) {
+    [[ -o interactive ]] &&
+      print -P "%F{red}!!! Can't find terminfo for $TERM, using xterm%f"
+    TERM=xterm
+}
 
-### freebsd
-if [[ "$OSTYPE" = "freebsd" ]]; then
-	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'
-fi
+### early zprofile sourcing
+# NOTE: see comments in .zprofile for additional rationale for this
+if [[ ! -o login ]] {
+    if [[ -v _sev_olduser && $_sev_olduser != $USERNAME ]] {
+        # set up some user-dependent stuff since we switched users
+        # XXX: _sev_switched_users is no longer implemented
+        _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
+    }
+} else {
+    # for convenience
+    cd ~
+}
+export _sev_olduser=$USERNAME
 
-### load site-specific
-if [[ -f ~/.zshenv.local ]]; then
-	source ~/.zshenv.local
-fi
+# vim: et sts=4 sw=4 ts=8 tw=79