summaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix17
1 files changed, 9 insertions, 8 deletions
diff --git a/flake.nix b/flake.nix
index 421bb2c8..9f573db8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,12 +39,9 @@
39 }; 39 };
40 home-manager = { 40 home-manager = {
41 type = "github"; 41 type = "github";
42 # owner = "nix-community"; 42 owner = "nix-community";
43 # repo = "home-manager";
44 # ref = "master";
45 owner = "gkleen";
46 repo = "home-manager"; 43 repo = "home-manager";
47 ref = "nixos-late-start"; 44 ref = "master";
48 inputs = { 45 inputs = {
49 nixpkgs.follows = "nixpkgs"; 46 nixpkgs.follows = "nixpkgs";
50 }; 47 };
@@ -151,7 +148,7 @@
151 type = "gitlab"; 148 type = "gitlab";
152 owner = "gkleen"; 149 owner = "gkleen";
153 repo = "ca"; 150 repo = "ca";
154 ref = "v3.1.5"; 151 ref = "v3.1.6";
155 inputs = { 152 inputs = {
156 pyproject-nix.follows = "pyproject-nix"; 153 pyproject-nix.follows = "pyproject-nix";
157 uv2nix.follows = "uv2nix"; 154 uv2nix.follows = "uv2nix";
@@ -246,6 +243,10 @@
246 flake-utils.follows = "flake-utils"; 243 flake-utils.follows = "flake-utils";
247 }; 244 };
248 }; 245 };
246 disko = {
247 url = "github:nix-community/disko/latest";
248 inputs.nixpkgs.follows = "nixpkgs";
249 };
249 }; 250 };
250 251
251 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs: 252 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs:
@@ -313,7 +314,7 @@
313 (inputs: inputs // { inherit userName; }) 314 (inputs: inputs // { inherit userName; })
314 (outputs: { _file = dir + "/${path}"; } 315 (outputs: { _file = dir + "/${path}"; }
315 // outputs 316 // outputs
316 // { imports = defaultUserProfiles userName ++ (outputs.imports or []); }); 317 // { imports = defaultUserProfiles userName ++ (outputs.imports or []); });
317 318
318 mkUserProfile = userName: dir: path: profileName: 319 mkUserProfile = userName: dir: path: profileName:
319 let 320 let
@@ -337,7 +338,7 @@
337 (inputs: inputs // { inherit userName hostName; }) 338 (inputs: inputs // { inherit userName hostName; })
338 (outputs: { _file = dir + "/${path}"; } 339 (outputs: { _file = dir + "/${path}"; }
339 // outputs 340 // outputs
340 // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); }); 341 // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); });
341 342
342 systemsSelector = "x86_64-linux"; 343 systemsSelector = "x86_64-linux";
343 systems = filter (system: !(isNull (builtins.match systemsSelector system))) nixpkgs.lib.systems.flakeExposed; 344 systems = filter (system: !(isNull (builtins.match systemsSelector system))) nixpkgs.lib.systems.flakeExposed;