use xdg for vim config, add viminfo to xdg

[dotfiles.git] / base / .zshenv

diff --git a/base/.zshenv b/base/.zshenv
index a709ce6efaf9b1520cce80985efc1160e6cc0953..462fefd89677447fe8e9e39ef09f94e8978eb0a8 100644 (file)
--- a/base/.zshenv
+++ b/base/.zshenv
@@ -1,29 +1,39 @@
+export ZDOTDIR=${XDG_CONFIG_HOME:-~/.config}/zsh
+
 ### load site-specific
-[[ -f ~/.zshenv.local ]] && source ~/.zshenv.local
+[[ -f ${ZDOTDIR:-~}/.zshenv.local ]] && source ${ZDOTDIR:-~}/.zshenv.local
 
 ### fix broken term
-if (( $#terminfo == 0 )) {
-    [[ -o interactive ]] &&
-      print -P "%F{red}!!! Can't find terminfo for $TERM, using xterm%f"
-    TERM=xterm
+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
 }
 
-### 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
+if [[ -o login ]] {
+    ### cd on login shell for convenience
+    # NOTE: we do this here and not in .zprofile since we occasionally might
+    # re-source .zprofile, and it's easier to just put the logic here...
+    cd ~
+} else {
+    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_disaply var isn't
+        #      exported; for example, this happens with sway without a display
+        #      manager or launcher in front of it
+        export _sev_first_display=
+        _sev_refresh_gpgagent= 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
+        ### early zprofile sourcing for first shell even if not a login 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
     }
-} else {
-    # for convenience
-    cd ~
 }
-export _sev_olduser=$USERNAME
 
 # vim: et sts=4 sw=4 ts=8 tw=79