diff --git a/modules/programs/zsh/default.nix b/modules/programs/zsh/default.nix index ecc8f3ef5..e3a03c03a 100644 --- a/modules/programs/zsh/default.nix +++ b/modules/programs/zsh/default.nix @@ -437,7 +437,7 @@ in { home.file."${dotDirRel}/.zshenv".text = '' # Environment variables - . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh" + . "${config.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh" # Only source this once if [[ -z "$__HM_ZSH_SESS_VARS_SOURCED" ]]; then diff --git a/tests/modules/programs/zsh/prezto.nix b/tests/modules/programs/zsh/prezto.nix index 9a22f6f65..c9a43b059 100644 --- a/tests/modules/programs/zsh/prezto.nix +++ b/tests/modules/programs/zsh/prezto.nix @@ -33,8 +33,8 @@ assertFileContains home-files/.zlogout 'logoutExtra' assertFileContains home-files/.zshenv 'envExtra' # make sure we are loading the environment variables - assertFileContains home-files/.zshenv \ - '. "/home/hm-user/.nix-profile/etc/profile.d/hm-session-vars.sh"' + assertFileContains $(normalizeStorePaths home-files/.zshenv) \ + '/nix/store/00000000000000000000000000000000-hm-session-vars.sh/etc/profile.d/hm-session-vars.sh' assertFileContains home-files/.zshenv \ 'export FOO="bar"' '';