fix(home): reload session vars in current shell

hmvar-reload was clearing the zsh-specific guard instead of Home Manager's __HM_SESS_VARS_SOURCED guard, so re-sourcing hm-session-vars.sh could return early without refreshing the environment.

The previous leading assignment also made the zsh alias compatibility layer wrap the command in bash -c, which meant source ran in a child process. Use unset so zsh sources in-place and keep fish on its dedicated hm-session-vars.fish function path.

Author: khaneliman

modules/home/programs/terminal/shells/alias-compat.nix

@@ -195,14 +195,21 @@ let
     let
       trimmed = trim value;
       body = if hasWrappedFunction trimmed then unwrapFunctionBody trimmed else trimmed;
+      sessionVarsPathMatch = builtins.match ".*source \"([^\"]*hm-session-vars\\.sh)\".*" trimmed;
       fishSessionVarsPath =
-        lib.replaceStrings
-          [ "__HM_ZSH_SESS_VARS_SOURCED=0 source " "hm-session-vars.sh" ]
-          [ "" "hm-session-vars.fish" ]
-          trimmed;
+        if sessionVarsPathMatch != null then
+          lib.replaceStrings [ "hm-session-vars.sh" ] [ "hm-session-vars.fish" ] (
+            builtins.elemAt sessionVarsPathMatch 0
+          )
+        else
+          lib.replaceStrings
+            [ "__HM_ZSH_SESS_VARS_SOURCED=0 source " "hm-session-vars.sh" ]
+            [ "" "hm-session-vars.fish" ]
+            trimmed;
     in
     if name == "hmvar-reload" then
       ''
+        set -e __HM_SESS_VARS_SOURCED
         if test -f ${fishSessionVarsPath}
           source ${fishSessionVarsPath}
         end
@@ -220,13 +227,15 @@ in
     ;
 
   translateAliasMap = lib.mapAttrs (_: translatedAliasValue);
-  translateFishAliasMap = aliases: lib.filterAttrs (_: value: !(isFishFunctionAlias value)) aliases;
+  translateFishAliasMap =
+    aliases:
+    lib.filterAttrs (name: value: name != "hmvar-reload" && !(isFishFunctionAlias value)) aliases;
   translateFishFunctions =
     aliases:
     lib.mapAttrs' (
       name: value:
       lib.nameValuePair name {
         body = fishBodyForAlias name value;
       }
-    ) (lib.filterAttrs (_: isFishFunctionAlias) aliases);
+    ) (lib.filterAttrs (name: value: name == "hmvar-reload" || isFishFunctionAlias value) aliases);
 }

modules/home/user/default.nix

@@ -130,7 +130,7 @@ in
           flake = "nix flake";
           nix = "nix -vL";
           gsed = "${getExe pkgs.gnused}";
-          hmvar-reload = ''__HM_ZSH_SESS_VARS_SOURCED=0 source "/etc/profiles/per-user/${config.khanelinix.user.name}/etc/profile.d/hm-session-vars.sh"'';
+          hmvar-reload = ''unset __HM_SESS_VARS_SOURCED; source "/etc/profiles/per-user/${config.khanelinix.user.name}/etc/profile.d/hm-session-vars.sh"'';
 
           # File management
           rcp = "${getExe pkgs.rsync} -rahP --mkpath --modify-window=1"; # Rsync copy keeping all attributes,timestamps,permissions"