summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock18
-rw-r--r--flake.nix7
-rw-r--r--system-profiles/core.nix2
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 @@
77 ] 77 ]
78 }, 78 },
79 "locked": { 79 "locked": {
80 "lastModified": 1647572216, 80 "lastModified": 1646559628,
81 "narHash": "sha256-HDOQ/Yq1ga5mbj0eUp/f5FY96TgOxwBjTfIRGsZsAlw=", 81 "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
82 "owner": "nix-community", 82 "owner": "nix-community",
83 "repo": "home-manager", 83 "repo": "home-manager",
84 "rev": "e2a85ac43f06859a50d067a029f0a303c4ca5264", 84 "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
85 "type": "github" 85 "type": "github"
86 }, 86 },
87 "original": { 87 "original": {
@@ -93,11 +93,11 @@
93 }, 93 },
94 "nixpkgs": { 94 "nixpkgs": {
95 "locked": { 95 "locked": {
96 "lastModified": 1647583734, 96 "lastModified": 1646927217,
97 "narHash": "sha256-K6dEaKzT1s+7/HUVYotgynDHU+sTBBlOMoY93g2nou8=", 97 "narHash": "sha256-MDrf1qb4LSxVU3+fQDZSoVbQf9nIVJmvFR1qdStAULE=",
98 "owner": "NixOS", 98 "owner": "NixOS",
99 "repo": "nixpkgs", 99 "repo": "nixpkgs",
100 "rev": "d96018d29976df5695f1d3eecb58c4202b940907", 100 "rev": "bcab564e83aeffbe321127b060beb7482a8e44bc",
101 "type": "github" 101 "type": "github"
102 }, 102 },
103 "original": { 103 "original": {
@@ -146,11 +146,11 @@
146 ] 146 ]
147 }, 147 },
148 "locked": { 148 "locked": {
149 "lastModified": 1647279403, 149 "lastModified": 1646696263,
150 "narHash": "sha256-ZsHfMah9+TElcjaENsaOIFHBNNtSbXmyLFVbiJiAECs=", 150 "narHash": "sha256-a+6WgDoU2fd4bbSFMqK67i/ZTPzia29otmyeODa1uDU=",
151 "owner": "Mic92", 151 "owner": "Mic92",
152 "repo": "sops-nix", 152 "repo": "sops-nix",
153 "rev": "c01f48b055ac776f9831c9d4a0fff83e3b74dbe3", 153 "rev": "4e21493d34f7485a568e05b9cbefa11fe047ecd3",
154 "type": "github" 154 "type": "github"
155 }, 155 },
156 "original": { 156 "original": {
diff --git a/flake.nix b/flake.nix
index f5008748..e380463b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
44 inherit (nixpkgs) lib; 44 inherit (nixpkgs) lib;
45 utils = import ./utils { inherit lib; }; 45 utils = import ./utils { inherit lib; };
46 inherit (utils) nixImport overrideModule; 46 inherit (utils) nixImport overrideModule;
47 inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists; 47 inherit (lib) nixosSystem mkIf splitString filterAttrs listToAttrs mapAttrsToList nameValuePair concatMap composeManyExtensions mapAttrs mapAttrs' recursiveUpdate genAttrs unique elem optionalAttrs isDerivation concatLists concatStringsSep;
48 48
49 accountUserName = accountName: 49 accountUserName = accountName:
50 let 50 let
@@ -210,6 +210,11 @@
210 filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs); 210 filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs);
211 in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides)); 211 in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides));
212 212
213 nixPath = forAllSystems (system: _: concatStringsSep ":" [
214 "nixpkgs=${nixpkgs.legacyPackages.${system}.path}"
215 "nixpkgs-overlays=${self.overlays-path.${system}}"
216 ]);
217
213 checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib; 218 checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
214 }; 219 };
215} 220}
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 {
51 extraOptions = '' 51 extraOptions = ''
52 experimental-features = nix-command flakes 52 experimental-features = nix-command flakes
53 ''; 53 '';
54 nixPath = [ 54 nixPath = lib.mkForce [
55 "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}" 55 "nixpkgs=${flakeInputs.nixpkgs.legacyPackages.${config.nixpkgs.system}.path}"
56 "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}" 56 "nixpkgs-overlays=${flake.overlays-path.${config.nixpkgs.system}}"
57 ]; 57 ];