zprofile: always prefer user bin dirs

diff --git a/base/.zprofile b/base/.zprofile
index f611b98542ac58129135c59e6ddd317578f87e6e..9179bcb2449c0a5c7a0161dd9770454e7ace7fbb 100644 (file)
--- a/base/.zprofile
+++ b/base/.zprofile
@@ -83,8 +83,9 @@ if [[ ! -v _sev_setup_path || -o login ]] {
     # NOTE: /usr/{local,pkg,games} are unix/bsdisms
     # XXX: PREFIX not validated, non-posix but Termux uses it
     syspath=("$path[@]")
-    path=({~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/sbin
-          {~,~/.local,{$PREFIX,}{,/opt,/usr{,/local,pkg}}}/bin
+    path=(~/{s,}bin
+          {~/.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[@]")
@@ -99,7 +100,7 @@ if [[ ! -v _sev_setup_path || -o login ]] {
     }
     # 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
+    unset syspath len i
     # 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