X-Git-Url: https://git.sev.monster/~sev/dotfiles.git/blobdiff_plain/294ed44e1a8dd7a6026213380c41bceb1a4a162a..ef32cb1c2ed740bba5cdbc1f9105233e99b3c106:/etc/zsh/.zshenv

diff --git a/etc/zsh/.zshenv b/etc/zsh/.zshenv
index 1bcc1f8..1248dbf 100644
--- a/etc/zsh/.zshenv
+++ b/etc/zsh/.zshenv
@@ -51,19 +51,24 @@ function _sev_zcleanup {
 }
 
 function _sev_setpath {
-    # 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
-    # NOTE: tied arrays path and fpath already exist
-    typeset -gU 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, maybe others
+    # NOTE: tied arrays path and fpath already exist, but are not unique (-U);
+    #       we utilize the fact that unique arrays keep the first occurrence
+    #       and remove any further occurences to check for elements from the
+    #       old PATH that we did not anticipate and shift them to the front,
+    #       since they are probably important to the system
+    typeset -gU path fpath
+    local -a syspath=("$path[@]")
+    # NOTE: /usr/{pkg,games} are unix/bsdisms
+    # NOTE: some systems (esp. research machines) may have multiple versions of
+    #       packages installed in /opt/[pkg]/[ver]/bin or other dirs, managed
+    #       with something like Environment Modules. this code does not account
+    #       for this type of usage and will add all valid paths. any undesired
+    #       paths can be removed using .zshenv.local.
+    # XXX: PREFIX not validated, non-POSIX but Termux uses it, maybe others
     # XXX: XDG specifies ~/.local/bin as the only user-writable dir for
     #      executables, but we specify more; technically this is against spec
-    local -a syspath=("$path[@]")
-    path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/opt,/opt/*{/*,},/usr{,/local,/pkg}}}/{s,}bin(N)
+    path=({{${_sev_home:-~},~}{/.local,},{$PREFIX,}{,/usr{,/local,/pkg},/opt{,/*{/*,}}}}/{s,}bin(N)
           {$PREFIX,}/usr/{X11R{7,6}/bin,games}
           # emulate Arch Linux flatpak-bindir.sh for use on other systems
           {${XDG_DATA_HOME:-~/.local/share},{$PREFIX,}/var/lib}/flatpak/exports/bin)
@@ -92,6 +97,7 @@ function _sev_setpath {
     }
     # FPATH is not exported by default
     export FPATH
+    # un-unique system arrays for consistency
     typeset +U path fpath
 }
 
@@ -205,7 +211,7 @@ if [[ ! -v _sev_setup_xdg ]] {
     # include any of the below dirs there, but you never know what crazy shit
     # people will do. I rather handle them sanely with our own code than let
     # them override after the fact.
-    [[ -e $XDG_CONFIG_HOME/user-dirs.dirs ]] &&
+    [[ -f $XDG_CONFIG_HOME/user-dirs.dirs ]] &&
       emulate sh -c "source $XDG_CONFIG_HOME/user-dirs.dirs"
 
     typeset -UT XDG_DATA_DIRS xdg_data_dirs
@@ -286,6 +292,12 @@ if [[ ! -v GNUPGHOME ]] {
   eval $(perl -I$XDG_DATA_HOME/perl5/lib/perl5 \
               -Mlocal::lib=$XDG_DATA_HOME/perl5 2>/dev/null)
 
+## go
+if [[ -v commands[go] ]] {
+    [[ ! -v GOPATH ]] && export GOPATH=${XDG_DATA_HOME:-~/.local/share}/go:~/go
+    [[ ! -v GOBIN  ]] && export GOBIN=~/.local/bin
+}
+
 ### load zshenv site-specific
 autoload -Uz load-site-dotfile
 load-site-dotfile zshenv