From fafc831d6be643ea184d117b2c8f48efa241e826 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Fri, 18 Mar 2022 09:34:09 +0100
Subject: ...

---
 flake.lock               | 18 +++++++++---------
 flake.nix                |  7 ++++++-
 system-profiles/core.nix |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 743ec50b..503197cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1647572216,
-        "narHash": "sha256-HDOQ/Yq1ga5mbj0eUp/f5FY96TgOxwBjTfIRGsZsAlw=",
+        "lastModified": 1646559628,
+        "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e2a85ac43f06859a50d067a029f0a303c4ca5264",
+        "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1647583734,
-        "narHash": "sha256-K6dEaKzT1s+7/HUVYotgynDHU+sTBBlOMoY93g2nou8=",
+        "lastModified": 1646927217,
+        "narHash": "sha256-MDrf1qb4LSxVU3+fQDZSoVbQf9nIVJmvFR1qdStAULE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d96018d29976df5695f1d3eecb58c4202b940907",
+        "rev": "bcab564e83aeffbe321127b060beb7482a8e44bc",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1647279403,
-        "narHash": "sha256-ZsHfMah9+TElcjaENsaOIFHBNNtSbXmyLFVbiJiAECs=",
+        "lastModified": 1646696263,
+        "narHash": "sha256-a+6WgDoU2fd4bbSFMqK67i/ZTPzia29otmyeODa1uDU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c01f48b055ac776f9831c9d4a0fff83e3b74dbe3",
+        "rev": "4e21493d34f7485a568e05b9cbefa11fe047ecd3",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f5008748..e380463b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
       inherit (nixpkgs) lib;
       utils = import ./utils { inherit lib; };
       inherit (utils) nixImport overrideModule;
-      inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists;
+      inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep;
 
       accountUserName = accountName: 
         let
@@ -210,6 +210,11 @@
           filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs);
         in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides));
 
+        nixPath = forAllSystems (system: _: concatStringsSep ":" [
+          "nixpkgs=${nixpkgs.legacyPackages.${system}.path}"
+          "nixpkgs-overlays=${self.overlays-path.${system}}"
+        ]);
+
         checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
       };
 }
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index c624bf0a..81cfa0e9 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -51,7 +51,7 @@ in {
       extraOptions = ''
         experimental-features = nix-command flakes
       '';
-      nixPath = [
+      nixPath = lib.mkForce [
         "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}"
         "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}"
       ];
-- 
cgit v1.2.3