From 142acd7a7d9eb7f0bb647f053b4ddfd01fdfbf1d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 11 Sep 2025 11:43:46 +0200
Subject: [PATCH] bash: source session variable file directly

---
 modules/programs/bash.nix                         | 2 +-
 tests/modules/programs/bash/session-variables.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/programs/bash.nix b/modules/programs/bash.nix
index f26b9968f..12def4fc2 100644
--- a/modules/programs/bash.nix
+++ b/modules/programs/bash.nix
@@ -265,7 +265,7 @@ in
       );
 
       home.file.".profile".source = writeBashScript "profile" ''
-        . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
+        . "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh"
 
         ${sessionVarsStr}
 
diff --git a/tests/modules/programs/bash/session-variables.nix b/tests/modules/programs/bash/session-variables.nix
index 3a9146733..81a2b209e 100644
--- a/tests/modules/programs/bash/session-variables.nix
+++ b/tests/modules/programs/bash/session-variables.nix
@@ -14,9 +14,9 @@
   nmt.script = ''
     assertFileExists home-files/.profile
     assertFileContent \
-      home-files/.profile \
+      "$(normalizeStorePaths home-files/.profile)" \
       ${builtins.toFile "session-variables-expected" ''
-        . "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh"
+        . "/nix/store/00000000000000000000000000000000-hm-session-vars.sh/etc/profile.d/hm-session-vars.sh"
 
         export V1="v1"
         export V2="v2-v1"