flatten setopt in zshrc

[dotfiles.git] / base / .zprofile

diff --git a/base/.zprofile b/base/.zprofile
index a6a548fe4d69dc07f8647f478300b345c6317e80..f611b98542ac58129135c59e6ddd317578f87e6e 100644 (file)
--- a/base/.zprofile
+++ b/base/.zprofile
@@ -18,85 +18,88 @@
 #     are legitimate reasons to want to do this, and in any case the shell
 #     should not choke or cause unexpected problems should it happen anyway.
 
 #     are legitimate reasons to want to do this, and in any case the shell
 #     should not choke or cause unexpected problems should it happen anyway.
 

-### detect cygwin
-[[ $OSTYPE =~ (cygwin|msys)* ]] && is_cygwin=
+### cleanup
+# XXX: only call after relevant vars have been set up, defined early so that
+#      below code can utilize it after they do so
+function _sev_zcleanup {
+    ## gpg forwarding
+    if [[ -d $_sev_gpg_forward_dir && ( -z $1 || $1 == 'gpg-forward' ) ]] {
+        # clean up forward dirs if its session is dead or we ask for it
+        find $_sev_gpg_forward_dir -mindepth 1 -maxdepth 1 -type d |
+          while {read -r x} {
+            # NOTE: the only way we can get here is if we have not been
+            #       forwarded before, if the user asks for it, or during
+            #       logout. if our own pid already has a dir, it is most likely
+            #       stale, the user wants it removed, or something is very
+            #       broken—in all 3 of these cases the best choice is remove it.
+            p=$(basename $x)
+            if {[[ -v _sev_gpg_forward_clean || $$ == $p ]] ||
+                ! kill -0 $p 2>/dev/null} {
+                find $x -mindepth 1 -maxdepth 1 | while {read -r y} {
+                    # XXX: real dirs will stop unlink, consider it a feature
+                    unlink $y
+                }
+                # don't force in case something important is still there
+                rmdir $x
+            }
+        }
+        # reset GNUPGHOME if we removed our own dir
+        if [[ $GNUPGHOME =~ '/.ssh_forward/\d+/*$' && ! -e $GNUPGHOME ]]
+            GNUPGHOME=${GNUPGHOME%$MATCH}
+    }

 
 

-### exports
-## lang
-export CHARSET=UTF-8
-export LANG=en_US.UTF-8
-export LC_CTYPE=$LANG
+    ## tmp
+    # NOTE: _sev_tmp is not unset so session dirs will not be recreated
+    # NOTE: XDG dirs that use our tmp are not unset here, they are in zlogout
+    if [[ -d $_sev_tmp && ( -z $1 || $1 == 'tmp' ) ]] {
+        # clean up tmp dirs if its session is dead or we ask for it
+        find $_sev_tmp -mindepth 1 -maxdepth 1 -name '.session.*' -type d |
+          while {read -r x} {
+            # NOTE: same rationale as above
+            p=${$(basename $x)#.session.}
+            if {[[ -v _sev_tmp_clean || $$ == $p ]] ||
+                ! kill -0 $p 2>/dev/null} {
+                rm -rf $x
+            }
+        }
+    }

 
 

-## msys2
-if [[ -v MSYSTEM && ! -v _sev_setup_msys2 ]] {
-    # path mangling exclusions for gpg-connect-agent
-    # https://www.gnupg.org/documentation/manuals/gnupg/Controlling-gpg_002dconnect_002dagent.html
-    export MSYS2_ARG_CONV_EXCL="${MSYS2_ARG_CONV_EXCL:+$MSYS2_ARG_CONV_EXCL;}\
-/echo;/let ;/definq;/datafile ;/showdef;/cleardev;/sendfd ;/recvfd;/open ;\
-/close ;/showopen;/serverpid;/sleep;/hex;/nohex;/decode;/nodecode;/subst;\
-/nosubst;/while ;/if ;/end;/run ;/bye;/help"
-    # ssh called from mingw64-git attempts to convert path to Windows, and
-    # causes it to choke. paths are converted to *nix before exporting and
-    # will work if cygwin ssh is installed (default).
-    export MSYS2_ENV_CONV_EXCL=_GNUPG_SOCK_
-    export _sev_setup_msys2=
+    unset x p y

 }
 
 }
 

+### lang
+export CHARSET=${CHARSET:-UTF-8}
+export LANG=${LANG:-en_US.UTF-8}
+export LC_CTYPE=${LC_TYPE:-$LANG}

 
 

-## path
+### path

 # NOTE: we utilize the fact that unique arrays keep the first occurrence and
 #       remove any further occurences to capture elements from the old PATH
 #       that we did not anticipate and shift them to the front, since they are
 #       probably important to the system
 if [[ ! -v _sev_setup_path || -o login ]] {
 # NOTE: we utilize the fact that unique arrays keep the first occurrence and
 #       remove any further occurences to capture elements from the old PATH
 #       that we did not anticipate and shift them to the front, since they are
 #       probably important to the system
 if [[ ! -v _sev_setup_path || -o login ]] {

-    typeset -a winpath
-    if [[ -v is_cygwin ]] {
-        windir=$(cygpath -uW)
-        sysdir=$(cygpath -uS)
-        winpath=($sysdir $windir $sysdir/Wbem
-                 $sysdir/WindowsPowerShell/v1.0
-                 $sysdir/../SysWOW64 $sysdir/../SysWOW64/Wbem
-                 $sysdir/../SysWOW64/WindowsPowerShell/v1.0)
-        for (( i = 1; i <= $#winpath; i++ )) {
-            winpath[$i]=${winpath[$i]:a}
-        }
-        unset windir sysdir
-    }

     typeset -U path fpath
     # add as many generic paths as possible to keep the order we want
     # NOTE: /usr/{local,pkg,games} are unix/bsdisms
     typeset -U path fpath
     # add as many generic paths as possible to keep the order we want
     # NOTE: /usr/{local,pkg,games} are unix/bsdisms

+    # XXX: PREFIX not validated, non-posix but Termux uses it

     syspath=("$path[@]")
     syspath=("$path[@]")

-    path=({~/,/,/usr/}sbin /opt/{s,}bin /usr/local/{s,}bin /usr/pkg/{s,}bin
-          /usr/X11R{7,6}/bin /usr/games {~/,/,/usr/}bin)
-    ((ulen=$#path))
-    [[ -v is_cygwin ]] && path=("$path[@]" "$winpath[@]")
-    ((wlen=$#path))
+    path=({~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/sbin
+          {~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/bin
+          /usr/{X11R{7,6}/bin,games})
+    ((len=$#path))

     path=("$path[@]" "$syspath[@]")
     # remove nonexistent and duplicate paths
     for (( i = 1; i <= $#path; i++ )) {
         if [[ ! -e $path[$i] ]] {
             path[$i]=()
     path=("$path[@]" "$syspath[@]")
     # remove nonexistent and duplicate paths
     for (( i = 1; i <= $#path; i++ )) {
         if [[ ! -e $path[$i] ]] {
             path[$i]=()

-            ((i <= ulen)) && ((ulen--))
-            ((i <= wlen)) && ((wlen--))
+            ((i <= len)) && ((len--))

             ((i--))
             continue
         }
             ((i--))
             continue
         }

-        if [[ ! -v is_cygwin ]] || (( i <= ulen )) { continue }
-        # Windows only: remove cygwin-ified duplicates case-insensitively
-        c=$(cygpath -u -- ${(L)path[$i]})
-        for (( j = i + 1; j <= $#path; j++ )) {
-            if [[ $c == $(cygpath -u -- ${(L)path[$j]}) ]] {
-                path[$j]=()
-                # NOTE: likelihood of our defined windows path being duplicate
-                #       is low, but just in case
-                ((j <= wlen)) && ((wlen--))
-                ((j--))
-            }
-        }
-        unset c

     }
     }

-    (( wlen > 0 )) && path=("${(@)path[wlen + 1, -1]}" "${(@)path[1, wlen]}")
-    unset winpath syspath ulen wlen i j
+    # shift valid system paths to the front if there are any left
+    ((len > 0 && len < $#path)) && path=("${(@)path[len + 1, -1]}" "${(@)path[1, len]}")
+    unset syspath len i j

     # include our zsh dir in fpath. unlike above, we always prefer our paths
     fpath=(${ZDOTDIR:-~/.zsh}/functions/{*,Completions/*}(N) "$fpath[@]")
     # FPATH is not exported by default
     # include our zsh dir in fpath. unlike above, we always prefer our paths
     fpath=(${ZDOTDIR:-~/.zsh}/functions/{*,Completions/*}(N) "$fpath[@]")
     # FPATH is not exported by default


@@ -105,74 +108,97 @@ if [[ ! -v _sev_setup_path || -o login ]] {
     export _sev_setup_path=
 }
 
     export _sev_setup_path=
 }
 

-## xdg
+### tmp
+# NOTE: specs say that POSIX tmp and XDG runtime directories should exist
+#       until the last session is logged out (POSIX can exist for longer).
+#       since we can't reliably keep track of sessions in a cross-platform
+#       manner, the current implementation should use a separate directory per
+#       toplevel session (i.e. SHLVL=1). this should placate most applications,
+#       though it is not expressly spec compliant.
+if [[ ! -v _sev_tmp ]] {
+    _sev_tmp=~/tmp
+    # create personal tmp dir
+    t=${TMPDIR:-${TEMP:-${TMP:-/tmp}}}/.home-$LOGNAME
+    [[ ! -e $t ]] && mkdir -m700 $t 2>/dev/null
+    if [[ ! -d $t ]] {
+        [[ -o interactive ]] &&
+          print -P "%F{red}!!! Can't create tmpdir $t%f"
+        # fallback bare directories
+        [[ -h $_sev_tmp ]] && unlink $_sev_tmp 2>/dev/null
+        [[ ! -e $_sev_tmp ]] && mkdir -m700 $_sev_tmp 2>/dev/null
+    }
+    # link home tmp for convenience if there isn't anything meaningful there
+    [[ -h $_sev_tmp || ! -e $_sev_tmp ]] && ln -sfn $t $_sev_tmp 2>/dev/null
+    export _sev_tmp=$(realpath $_sev_tmp)
+    # ensure dir is clean
+    _sev_zcleanup tmp
+    # finally create our subdir for this session
+    h=$_sev_tmp/.session.$$
+    mkdir -m700 $h 2>/dev/null
+    export TMPDIR=$h TEMP=$h TMP=$h
+    unset t h
+}
+
+### xdg

 if [[ ! -v _sev_setup_xdg ]] {
     # merge with any existing dirs and remove duplicates using unique arrays
 if [[ ! -v _sev_setup_xdg ]] {
     # merge with any existing dirs and remove duplicates using unique arrays

-    # NOTE: include and then remove .config and .local/share to ensure it is
-    #       not present in the array if it was added before we got to it
+    # NOTE: include and then remove CONFIG_HOME and DATA_HOME to ensure they
+    #       are not present in the array if it was added before we got to it

     typeset -UT XDG_CONFIG_DIRS xdg_config_dirs
     typeset -UT XDG_CONFIG_DIRS xdg_config_dirs

-    typeset -UT XDG_DATA_DIRS xdg_data_dirs
-    export XDG_CONFIG_HOME=$HOME/etc
-    xdg_config_dirs=($XDG_CONFIG_HOME $HOME/.config
+    export XDG_CONFIG_HOME=~/etc
+    mkdir $XDG_CONFIG_HOME 2>/dev/null
+    xdg_config_dirs=($XDG_CONFIG_HOME ~/.config

       {/opt,/usr/local,/usr/pkg,}/etc/xdg
       "${XDG_CONFIG_DIRS:+${xdg_config_dirs[@]}}")
     export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS#$XDG_CONFIG_HOME}
       {/opt,/usr/local,/usr/pkg,}/etc/xdg
       "${XDG_CONFIG_DIRS:+${xdg_config_dirs[@]}}")
     export XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS#$XDG_CONFIG_HOME}

-    export XDG_DATA_HOME=$HOME/share
-    xdg_data_dirs=($XDG_DATA_HOME $HOME/.local/share
+
+    typeset -UT XDG_DATA_DIRS xdg_data_dirs
+    export XDG_DATA_HOME=~/share
+    mkdir $XDG_DATA_HOME 2>/dev/null
+    xdg_data_dirs=($XDG_DATA_HOME ~/.local/share

       /{opt,usr/local,usr/pkg,usr}/share
       "${XDG_DATA_DIRS:+${xdg_data_dirs[@]}}")
     export XDG_DATA_DIRS=${XDG_DATA_DIRS#$XDG_DATA_HOME}
       /{opt,usr/local,usr/pkg,usr}/share
       "${XDG_DATA_DIRS:+${xdg_data_dirs[@]}}")
     export XDG_DATA_DIRS=${XDG_DATA_DIRS#$XDG_DATA_HOME}

-    # use our custom tmp for cache and runtime
-    export XDG_CACHE_HOME=~/tmp
-    # NOTE: it's intentional to keep the same runtime dir for the whole session
-    #       and not create a new one if a new login shell is spawned, since the
-    #       spec calls for the same dir to be utilized for each "session".
-    export XDG_RUNTIME_DIR=~/tmp/xdg.$$
-}

 
 

-## temp
-if [[ ! -v _sev_setup_tmp ]] {
-    t=${TMPDIR:-${TEMP:-${TMP:-/tmp}}}/.home-$LOGNAME
-    if [[ ! -e $t ]] {
-        mkdir -m700 $t 2>/dev/null
-        if [[ ! -d $t ]] {
-            [[ -o interactive ]] &&
-              print -P "%F{red}!!! Can't create temp folder $t%f"
-            # fallback bare directories
-            [[ -h $XDG_CACHE_HOME ]] && unlink $XDG_CACHE_HOME 2>/dev/null
-            [[ ! -e $XDG_CACHE_HOME ]] && mkdir -m700 $XDG_CACHE_HOME 2>/dev/null
-        }
-    }
-    if [[ -e $t ]] {
-        export TMPDIR=$t TEMP=$t TMP=$t
-        # [re-]create link to our tmp if safe
-        [[ -h $XDG_CACHE_HOME || ! -e $XDG_CACHE_HOME ]] &&
-          ln -sf $t $XDG_CACHE_HOME 2>/dev/null
-    } else {
-        # ensure proper tmp vars, e.g. msys2 does not set TMPDIR
-        : ${TMPDIR:=${TEMP:-${TMP:-/tmp}}}
-        : ${TEMP:=$TMPDIR}
-        : ${TMP:=$TMPDIR}
+    mkdir ~/var 2>/dev/null
+    export XDG_STATE_HOME=~/var/lib
+    mkdir $XDG_STATE_HOME 2>/dev/null
+
+    if [[ -v _sev_tmp ]] {
+        export XDG_CACHE_HOME=$_sev_tmp/.xdg.cache
+        mkdir $XDG_CACHE_HOME 2>/dev/null
+
+        export XDG_RUNTIME_DIR=$TMPDIR/.xdg.runtime
+        # same as in tmpdir creation, ensure it doesn't exist
+        if [[ -h $XDG_RUNTIME_DIR ]]; then
+            unlink $XDG_RUNTIME_DIR 2>/dev/null
+        elif [[ -e $XDG_RUNTIME_DIR ]]; then
+            rm -rf $XDG_RUNTIME_DIR 2>/dev/null
+        fi
+        mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null

     }
     }

-    unset t
-    export _sev_setup_tmp=
-}

 
 

-## xdg
-if [[ ! -v _sev_setup_xdg ]] {
-    # create xdg runtime dir
-    # NOTE: spec says the dir should only exist for the lifetime of the
-    #       session, so if there is already something there it is likely stale
-    #       or something is very broken—assume the former.
-    [[ -e $XDG_RUNTIME_DIR ]] && rm -rf $XDG_RUNTIME_DIR 2>/dev/null &&
-      mkdir -m700 $XDG_RUNTIME_DIR 2>/dev/null

     # source user dirs after other vars
     [[ -e $XDG_CONFIG_HOME/user-dirs.dirs ]] &&
       emulate sh -c "source $XDG_CONFIG_HOME/user-dirs.dirs"
     export _sev_setup_xdg=
 }
 
     # source user dirs after other vars
     [[ -e $XDG_CONFIG_HOME/user-dirs.dirs ]] &&
       emulate sh -c "source $XDG_CONFIG_HOME/user-dirs.dirs"
     export _sev_setup_xdg=
 }
 

-## gpg forwarding
+### dbus
+if [[ ! -v DBUS_SESSION_BUS_ADDRESS && -v commands[dbus-launch] ]] {
+    eval $(dbus-launch)
+    export DBUS_SESSION_BUS_ADDRESS DBUS_SESSION_BUS_PID
+}
+
+### gpg home
+if [[ ! -v GNUPGHOME ]] {
+    export GNUPGHOME=~/etc/gnupg
+    if [[ -d ~/.gnupg ]] {
+        mv ~/.gnupg ~/etc/gnupg
+    }
+}
+
+### gpg agent + forwarding

 # NOTE: while ssh manages its auth sock in its protocol when ForwardSsh is
 #       enabled, GPG must be forwarded manually over Unix socket. to support
 #       this, we forward the restricted gpg-agent extra socket to the remote
 # NOTE: while ssh manages its auth sock in its protocol when ForwardSsh is
 #       enabled, GPG must be forwarded manually over Unix socket. to support
 #       this, we forward the restricted gpg-agent extra socket to the remote


@@ -183,10 +209,10 @@ if [[ ! -v _sev_setup_xdg ]] {
 #       socket, rather than replace the sockets in GNUPGHOME which will be
 #       overridden on the next connection. previously, you could provide a path
 #       to the agent socket in GPG_AGENT_INFO, but that was deprecated in GPG
 #       socket, rather than replace the sockets in GNUPGHOME which will be
 #       overridden on the next connection. previously, you could provide a path
 #       to the agent socket in GPG_AGENT_INFO, but that was deprecated in GPG

-#       v2.1. instead, we must clone GNUPGHOME and replace the agent sockets
-#       there with the forwarded one.
+#       v2.1. instead, we must clone GNUPGHOME with links and replace the agent
+#       sockets there with the forwarded one.

 # NOTE: since Unix sockets are not supported under Windows, this will not work
 # NOTE: since Unix sockets are not supported under Windows, this will not work

-#       under msys, cygwin, mingw, etc.
+#       under msys, cygwin, mingw, etc., but may work under wsl2.

 # HACK: without SendEnv, which is disabled by default in most sshd configs,
 #       there is no foolproof way to prevent race conditions via filename
 #       collisions or to pass the desired forward path to the remote host
 # HACK: without SendEnv, which is disabled by default in most sshd configs,
 #       there is no foolproof way to prevent race conditions via filename
 #       collisions or to pass the desired forward path to the remote host


@@ -199,149 +225,148 @@ if [[ ! -v _sev_setup_xdg ]] {
 #       the host if the path the client wants to use is writable. however, this
 #       would open up too many edge cases where it wouldn't work or be clunky
 #       (e.g. asking for password twice) to make it worth it.
 #       the host if the path the client wants to use is writable. however, this
 #       would open up too many edge cases where it wouldn't work or be clunky
 #       (e.g. asking for password twice) to make it worth it.

-if [[ ! -v _sev_setup_gpg ]] {
-    # helper function for decoding gpgconf socket paths
-    function _socketpath {
-        # dirs are percent-encoded
-        # https://stackoverflow.com/a/64312099
-        local x=${1//(#b)%([[:xdigit:]](#c2))/${(#):-0x$match[1]}}
-        # remove \r from Windows paths
-        if [[ -v commands[cygpath] ]] {
-            x=$(cygpath -u -- ${x/%$'\r'} 2>/dev/null)
+function _gpg_socketpath {
+    # dirs are percent-encoded: https://stackoverflow.com/a/64312099
+    echo ${1//(#b)%([[:xdigit:]](#c2))/${(#):-0x$match[1]}}
+}
+if [[ ! -v _sev_setup_gpg_forward && -v commands[gpg] ]] {
+    export _GNUPG_SOCK_DEST_BASE=/tmp/.gpg-agent-forward
+    export _GNUPG_SOCK_DEST_EXT=$(date +%s).$RANDOM
+    export _GNUPG_SOCK_DEST=$_GNUPG_SOCK_DEST_BASE.$_GNUPG_SOCK_DEST_EXT
+    export _sev_gpg_forward_dir=${GNUPGHOME:-~/.gnupg}/.ssh_forward
+    _sev_zcleanup gpg-forward
+
+    # find our forwarded socket
+    s=($_GNUPG_SOCK_DEST_BASE*(N=oc[1]))
+    if [[ -n $s && -v SSH_CLIENT ]] {
+        # create new forward dir
+        export _sev_setup_gpg_forward=
+        h=$_sev_gpg_forward_dir/$$
+        mkdir -pm700 $h
+        # XXX: is it safe to link scdaemon socket? can its name be changed?
+        for x (S.scdaemon gpg.conf gpg-agent.conf sshcontrol random_seed
+               pubring.kbx{,~} trustdb.gpg private-keys-v1.d crls.d) {
+            ln -s ${GNUPGHOME:-~/.gnupg}/$x $h

         }
         }

-        echo $x
+        export GNUPGHOME=$h
+        unset h
+        for x in $(gpgconf --list-dirs | grep 'agent-.*-\?socket:'); do
+            x=$(_gpg_socketpath ${x/#agent-*socket:})
+            if [[ ! -v orig ]] {
+                # move forwarded socket to first valid agent socket path
+                # XXX: if tmp is on different filesystem this may not work
+                mv $s $x
+                orig=$x
+            } else {
+                # make links to forwarded socket for any others
+                ln -s $orig $x
+            }
+        done
+        unset x orig

     }
     }

+    unset s

 
 

-    if [[ ! -v _sev_gpg_forwarded && -v commands[gpg] ]] {
-        export _GNUPG_SOCK_DEST_BASE=/tmp/.gpg-agent-forward
-        export _GNUPG_SOCK_DEST_EXT=$(date +%s).$RANDOM
-        export _GNUPG_SOCK_DEST=$_GNUPG_SOCK_DEST_BASE.$_GNUPG_SOCK_DEST_EXT
-        export _sev_gpg_forward_dir=${GNUPGHOME:-~/.gnupg}/.ssh_forward
-        # clean up forwards if its session is dead or we ask for it
-        if [[ -d $_sev_gpg_forward_dir ]] {
-            find $_sev_gpg_forward_dir -type d -mindepth 1 -maxdepth 1 |
-              while read -r x; do
-                # NOTE: the only way we can get here is if we have not been
-                #       forwarded before. if our own pid already has a dir, it
-                #       is most likely stale, or something is very broken—
-                #       assume the former.
-                p=$(basename $x)
-                if [[ -v _sev_gpg_forward_clean || $$ == $p ]] ||
-                      ! kill -0 $p 2>/dev/null; then
-                    find $x -mindepth 1 -maxdepth 1 | while read -r y; do
-                        unlink $y
-                    done
-                    rmdir $x
-                fi
-            done
-            unset x p y
-        }
+    # what we will forward if we start a new ssh connection
+    # NOTE: do this after setting up GNUPGHOME to pick up new socket path;
+    #       if already connected over SSH, extra should be the remote one
+    export _GNUPG_SOCK_SRC=$(_gpg_socketpath \
+      $(gpgconf --list-dirs agent-extra-socket))
+} elif [[ ! -v _sev_setup_gpg_forward ]] {
+    # required for RemoteForward to not error out if the vars are unset
+    [[ ! -v _GNUPG_SOCK_SRC ]] && export _GNUPG_SOCK_SRC=/nonexistent
+    [[ ! -v _GNUPG_SOCK_DEST ]] && export _GNUPG_SOCK_DEST=/nonexistent
+}

 
 

-        # find our forwarded socket
-        s=($_GNUPG_SOCK_DEST_BASE*(N=oc[1]))
-        if [[ -n $s && -v SSH_CLIENT ]] {
-            # create new forward dir
-            export _sev_gpg_forwarded=
-            mkdir -pm700 $_sev_gpg_forward_dir
-            h=$_sev_gpg_forward_dir/$$
-            mkdir -pm700 $h
-            # XXX: is it safe to link scdaemon socket? can its name be changed?
-            for x in S.scdaemon gpg.conf gpg-agent.conf sshcontrol \
-                     pubring.kbx trustdb.gpg private-keys-v1.d crls.d; do
-                ln -s ${GNUPGHOME:-~/.gnupg}/$x $h
-            done
-            export GNUPGHOME=$h
-            unset h
-            for x in $(gpgconf --list-dirs | grep 'agent-.*-\?socket:'); do
-                x=$(_socketpath ${x/#agent-*socket:})
-                if [[ ! -v orig ]] {
-                    mv $s $x
-                    orig=$x
-                } else {
-                    ln -s $orig $x
-                }
-            done
-            unset x orig
+### gpg agent
+if [[ -v commands[gpg-connect-agent] && ( ! -v _sev_setup_gpgagent ||
+        ( -v _sev_first_display && -z $_sev_first_display ) ) ]] {
+    # avoid printing if we have already set up tty before
+    [[ ! -v _sev_setup_gpgagent && -o interactive ]] && p=true || p=false
+    if {$p} {
+        print -nP '%F{blue}>>>%f GPG: '
+        if [[ -v _sev_setup_gpg_forward ]] {
+            print -nP '%F{yellow}Forwarded agent '
+        } else {
+            print -nP '%F{green}Agent '

         }
         }

-        unset s
-
-        # what we will forward if we start a new ssh connection
-        # NOTE: do this after setting up GNUPGHOME to pick up new socket path;
-        #       if already connected over SSH, extra should be the remote one
-        export _GNUPG_SOCK_SRC=$(_socketpath \
-          $(gpgconf --list-dirs agent-extra-socket))
-    } else {
-        # required for RemoteForward to not error out if the vars are unset
-        [[ ! -v _GNUPG_SOCK_SRC ]] && export _GNUPG_SOCK_SRC=/nonexistent
-        [[ ! -v _GNUPG_SOCK_DEST ]] && export _GNUPG_SOCK_DEST=/nonexistent

     }
     }

-
-    ## gpg agent
-    if [[ -v commands[gpg-connect-agent] ]] {
-        [[ -o interactive ]] && print -nP '%F{blue}>>>%f GPG agent: %F{green}'
-        gpg-connect-agent /bye >/dev/null 2>&1
-        if [[ $? -ne 0 ]] {
-            [[ -o interactive ]] &&
-              print -P '%F{red}Error communicating with GPG agent%f'
-        } elif [[ ! -v _sev_gpg_forward && ! -v GPG_TTY &&
-                  ( -o interactive || -v DISPLAY ) ]] {
-            # if we aren't forwarded, set up tty if it isn't and we're
-            # in an interactive session
-            export GPG_TTY=$(tty)
-            export PINENTRY_USER_DATA=USE_TTY=$((!${+DISPLAY}))
-            gpg-connect-agent UPDATESTARTUPTTY /bye >/dev/null 2>&1
-            [[ -o interactive ]] &&
-              print -P "Updated TTY%f"
-        } else {
-            [[ -o interactive ]] &&
-              print -P 'Ready%f'
+    gpg-connect-agent /bye >/dev/null 2>&1
+    if [[ $? -ne 0 ]] {
+        $p && print -P '%F{red}communication error'
+    } else {
+        if [[ ! -v _sev_setup_gpg_forward ]] {
+            if [[ ${+GPG_TTY} -eq 0 && -o interactive ]]
+                export GPG_TTY=$(tty)
+            if [[ ( -v DISPLAY || -v WAYLAND_DISPLAY ) &&
+                  ${PINENTRY_USER_DATA/USE_TTY=0} == $PINENTRY_USER_DATA ]]
+                export PINENTRY_USER_DATA=USE_TTY=$((
+                  ${+DISPLAY} + ${+WAYLAND_DISPLAY} == 0))
+            # XXX: don't know if gpg-agent supports comments after directives
+            # XXX: path could have #
+            sed -Ei 's#^([[:space:]]*pinentry-program[[:space:]]).*$#\1'${commands[pinentry]:-/dev/null}'#' \
+              ${GNUPGHOME:-~/.gnupg}/gpg-agent.conf
+            # XXX: could check for changes before doing this to save perf
+            gpg-connect-agent RELOADAGENT UPDATESTARTUPTTY /bye >/dev/null 2>&1
+            if {$p} {
+                gpg-connect-agent /subst /serverpid \
+                  "/echo pid \${get serverpid} on $GPG_TTY" /bye 2>/dev/null
+                print -nP '%f'
+            }
+        } elif {$p} {
+            print -P '%f'

         }
         }

+        export _sev_setup_gpgagent=

     }
     }

+    unset p
+}

 
 

-    ## ssh agent
+### ssh agent
+if [[ ! -v _sev_setup_ssh ]] {

     # NOTE: preferred order of agents to check: okcagent, gnupg, openssh
     #       first block takes care of okcagent and openssh, second gnupg
     # NOTE: preferred order of agents to check: okcagent, gnupg, openssh
     #       first block takes care of okcagent and openssh, second gnupg

+    # XXX: doesn't actually check if ssh is enabled in gpg

     [[ -o interactive ]] && print -nP '%F{blue}>>>%f SSH: %F{green}'
     if [[ ! -v SSH_AUTH_SOCK && ( -v commands[okc-ssh-agent] ||
           ( -v commands[ssh-agent] && ! -v commands[gpg] ) ) ]] {
         okc=${commands[okc-ssh-agent]:+okc-}
     [[ -o interactive ]] && print -nP '%F{blue}>>>%f SSH: %F{green}'
     if [[ ! -v SSH_AUTH_SOCK && ( -v commands[okc-ssh-agent] ||
           ( -v commands[ssh-agent] && ! -v commands[gpg] ) ) ]] {
         okc=${commands[okc-ssh-agent]:+okc-}

-        agentfile=~/tmp/${okc}ssh-agent-exports
+        t=${_sev_tmp:-${TMPDIR:-${TEMP:-${TMP:-/tmp}}}}
+        e=$t/${okc}ssh-agent-exports

         typeset sock=
         typeset -i pid=
         typeset sock=
         typeset -i pid=

-        if [[ -f $agentfile ]] {
-            IFS=$'\0' read -r sock pid <$agentfile
+        if [[ -f $e ]] {
+            IFS=$'\0' read -r sock pid <$e

         }
         if [[ -S $sock && $pid > 0 ]] && kill -0 $pid; then
             [[ -o interactive ]] && print -P "Reusing agent PID $pid%f"
             export SSH_AUTH_SOCK=$sock
             export SSH_AGENT_PID=$pid
         else
         }
         if [[ -S $sock && $pid > 0 ]] && kill -0 $pid; then
             [[ -o interactive ]] && print -P "Reusing agent PID $pid%f"
             export SSH_AUTH_SOCK=$sock
             export SSH_AGENT_PID=$pid
         else

-            e=${okc}ssh-agent
+            e='TMPDIR=$t ${okc}ssh-agent'

             # TODO: ensure ssh-agent path looks legit to avoid unsafe eval?
             # XXX: doesn't appear to be any other way to handle redirection.
             #      because eval needs to write to current scope environment
             #      subshells can't be used to capture output and print.
             if [[ -o interactive ]] {
             # TODO: ensure ssh-agent path looks legit to avoid unsafe eval?
             # XXX: doesn't appear to be any other way to handle redirection.
             #      because eval needs to write to current scope environment
             #      subshells can't be used to capture output and print.
             if [[ -o interactive ]] {

-                eval `$e`
+                eval $(eval $=e)

                 print -nP '%f'
             } else {
                 print -nP '%f'
             } else {

-                eval `$e` >/dev/null 2>&1
+                eval $(eval $=e) >/dev/null 2>&1

             }
             }

-            echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$agentfile
+            echo -n $SSH_AUTH_SOCK$'\0'$SSH_AGENT_PID >!$e

         fi
         fi

-        unset okc agentfile sock pid
+        unset okc t e sock pid

     } elif [[ ! -v SSH_AUTH_SOCK && -v commands[gpg] ]] {
     } elif [[ ! -v SSH_AUTH_SOCK && -v commands[gpg] ]] {

-        # since gpg agent was started above, we just have to export and notify
+        # since gpg should have been started above, just export and notify

         if [[ -o interactive ]] {
         if [[ -o interactive ]] {

-            if [[ -v _sev_gpg_forwarded ]] {
-                echo 'Remote GPG agent'
+            if [[ -v _sev_setup_gpg_forward ]] {
+                echo 'Forwarded GPG agent'

             } else {
                 gpg-connect-agent /subst /serverpid \
             } else {
                 gpg-connect-agent /subst /serverpid \

-                  '/echo GPG agent PID ${get serverpid}' /bye
+                  '/echo GPG agent pid ${get serverpid}' /bye

             }
             print -nP '%f'
         }
             }
             print -nP '%f'
         }

-        export SSH_AUTH_SOCK=$(_socketpath \
+        export SSH_AUTH_SOCK=$(_gpg_socketpath \

           $(gpgconf --list-dirs agent-ssh-socket))
     } elif [[ -v SSH_AUTH_SOCK ]] {
         [[ -o interactive ]] && print -P 'Preconfigured agent%f'
           $(gpgconf --list-dirs agent-ssh-socket))
     } elif [[ -v SSH_AUTH_SOCK ]] {
         [[ -o interactive ]] && print -P 'Preconfigured agent%f'


@@ -349,19 +374,18 @@ if [[ ! -v _sev_setup_gpg ]] {
         [[ -o interactive ]] && print -P '%F{red}No agent available%f'
     }
 
         [[ -o interactive ]] && print -P '%F{red}No agent available%f'
     }
 

-    ## cleanup
-    # unset gpg helper
-    unfunction _socketpath
-
-    ## perl local lib
-    [[ -v commands[perl] && -d $XDG_DATA_HOME/perl5/lib/perl5 ]] &&
-      eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5
-                  -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)
+    export _sev_setup_ssh=

 }
 }

+unfunction _gpg_socketpath
+
+### perl local lib
+[[ -v commands[perl] && -d $XDG_DATA_HOME/perl5/lib/perl5 &&
+   ! -v PERL_LOCAL_LIB_ROOT ]] &&
+  eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5 \
+              -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)

 
 

-unset is_cygwin

 
 

-# load site-specific
+### load site-specific

 if [[ -f ~/.zprofile.local ]] { source ~/.zprofile.local }
 
 # vim: et sts=4 sw=4 ts=8 tw=79
 if [[ -f ~/.zprofile.local ]] { source ~/.zprofile.local }
 
 # vim: et sts=4 sw=4 ts=8 tw=79