profiles/common: Use nix.nixPath to set NIX_PATH.

We were using environment.sessionVariables before, but
NixOS/nixpkgs@3f1354a added an option exclusively for this. It
internally still sets environment.sessionVariables, so it doesn't change
anything for us because we're overriding the full list anyway.

But should we switch from overriding to appending/prepending someday, we
could get unexpected behaviour, so that's why I'm switching to
nix.nixPath here.

Thanks to @devhell for bringing this to my attention.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>

1 files changed, 7 insertions, 9 deletions

diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix
index 07efcb38..9dc788cb 100644
--- a/modules/profiles/common.nix
+++ b/modules/profiles/common.nix
@@ -37,16 +37,14 @@ with lib;
       "headcounter.org:/7YANMvnQnyvcVB6rgFTdb8p5LG1OTXaO+21CaOSBzg="
     ];
 
-    environment.sessionVariables = let
+    nix.nixPath = let
       rootChannelsPath = "/nix/var/nix/profiles/per-user/root/channels";
       channelPath = "${rootChannelsPath}/${config.vuizvui.channelName}";
-    in mkIf config.vuizvui.modifyNixPath {
-      NIX_PATH = mkOverride 90 [
-        "vuizvui=${channelPath}"
-        "nixpkgs=${channelPath}/nixpkgs"
-        "nixos-config=/etc/nixos/configuration.nix"
-        rootChannelsPath
-      ];
-    };
+    in mkIf config.vuizvui.modifyNixPath (mkOverride 90 [
+      "vuizvui=${channelPath}"
+      "nixpkgs=${channelPath}/nixpkgs"
+      "nixos-config=/etc/nixos/configuration.nix"
+      rootChannelsPath
+    ]);
   };
 }