summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock22
-rw-r--r--flake.nix10
-rw-r--r--system-profiles/core/default.nix6
3 files changed, 35 insertions, 3 deletions
diff --git a/flake.lock b/flake.lock
index d5b423ba..a3c569b7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -368,6 +368,27 @@
368 "type": "github" 368 "type": "github"
369 } 369 }
370 }, 370 },
371 "home-manager-eostre": {
372 "inputs": {
373 "nixpkgs": [
374 "nixpkgs-eostre"
375 ]
376 },
377 "locked": {
378 "lastModified": 1700814205,
379 "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
380 "owner": "gkleen",
381 "repo": "home-manager",
382 "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
383 "type": "github"
384 },
385 "original": {
386 "owner": "gkleen",
387 "ref": "nixos-late-start-23.11",
388 "repo": "home-manager",
389 "type": "github"
390 }
391 },
371 "nix-github-actions": { 392 "nix-github-actions": {
372 "inputs": { 393 "inputs": {
373 "nixpkgs": [ 394 "nixpkgs": [
@@ -753,6 +774,7 @@
753 "flake-registry": "flake-registry", 774 "flake-registry": "flake-registry",
754 "flake-utils": "flake-utils_3", 775 "flake-utils": "flake-utils_3",
755 "home-manager": "home-manager", 776 "home-manager": "home-manager",
777 "home-manager-eostre": "home-manager-eostre",
756 "nix-index-database": "nix-index-database", 778 "nix-index-database": "nix-index-database",
757 "nixpkgs": "nixpkgs_2", 779 "nixpkgs": "nixpkgs_2",
758 "nixpkgs-eostre": "nixpkgs-eostre", 780 "nixpkgs-eostre": "nixpkgs-eostre",
diff --git a/flake.nix b/flake.nix
index 7ed56d44..eaa93432 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,15 @@
49 nixpkgs.follows = "nixpkgs"; 49 nixpkgs.follows = "nixpkgs";
50 }; 50 };
51 }; 51 };
52 home-manager-eostre = {
53 type = "github";
54 owner = "gkleen";
55 repo = "home-manager";
56 ref = "nixos-late-start-23.11";
57 inputs = {
58 nixpkgs.follows = "nixpkgs-eostre";
59 };
60 };
52 sops-nix = { 61 sops-nix = {
53 type = "github"; 62 type = "github";
54 owner = "Mic92"; 63 owner = "Mic92";
@@ -181,6 +190,7 @@
181 flake = self; 190 flake = self;
182 flakeInputs = inputs; 191 flakeInputs = inputs;
183 path = ./.; 192 path = ./.;
193 home-manager = inputs.${if inputs ? "home-manager-${hostName}" then "home-manager-${hostName}" else "home-manager"};
184 }; 194 };
185 modules = 195 modules =
186 let 196 let
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix
index 67d50606..0859d707 100644
--- a/system-profiles/core/default.nix
+++ b/system-profiles/core/default.nix
@@ -1,4 +1,4 @@
1{ flake, flakeInputs, path, hostName, config, lib, pkgs, customUtils, ... }: 1{ flake, flakeInputs, home-manager, path, hostName, config, lib, pkgs, customUtils, ... }:
2 2
3with lib; 3with lib;
4 4
@@ -7,8 +7,8 @@ let
7 userProfileSet = customUtils.types.attrNameSet (zipAttrs (attrValues flake.nixosModules.userProfiles)); 7 userProfileSet = customUtils.types.attrNameSet (zipAttrs (attrValues flake.nixosModules.userProfiles));
8 hasSops = config.sops.secrets != {}; 8 hasSops = config.sops.secrets != {};
9in { 9in {
10 imports = with flakeInputs; 10 imports =
11 [ sops-nix.nixosModules.sops 11 [ flakeInputs.sops-nix.nixosModules.sops
12 home-manager.nixosModules.home-manager 12 home-manager.nixosModules.home-manager
13 ]; 13 ];
14 14