diff --git a/export/nixosConfigurations.nix b/export/nixosConfigurations.nix index f8e8118..e712097 100644 --- a/export/nixosConfigurations.nix +++ b/export/nixosConfigurations.nix @@ -5,13 +5,9 @@ modules = builtins.concatLists (map (base: builtins.attrValues (flake.lib.scan { base = "${base}/host/${name}"; })) flake.lib.schema.base) ++ [ { config.networking.hostName = name; } ] ++ [ nixosModules.default ] - ++ inputs.${nixpkgs}.lib.optional (inputs ? home-manager) { - imports = [ inputs.home-manager.nixosModules.default ]; - config.home-manager = { - sharedModules = [ hmModules.default ]; - extraSpecialArgs = { inherit flake namespace; }; - }; - } + ++ [ inputs.home-manager.nixosModules.default ] + ++ [ { config.home-manager.sharedModules = [ hmModules.default ]; } ] + ++ [ { config.home-manager.extraSpecialArgs = { inherit flake namespace; }; } ] ++ builtins.attrValues nixosUsers ++ builtins.attrValues nixosGroups ; diff --git a/flake.lock b/flake.lock index c5c30f9..a10bd87 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747688870, + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "d5f1f641b289553927b3801580598d200a501863", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1751274312, @@ -34,6 +55,7 @@ "root": { "inputs": { "hardware": "hardware", + "home-manager": "home-manager", "nixpkgs": "nixpkgs" } } diff --git a/flake.nix b/flake.nix index 3006b89..5f5c238 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; hardware.url = "github:nixos/nixos-hardware"; + home-manager = { + url = "github:nix-community/home-manager/release-24.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, ... }@inputs: import ./lib/flake.nix inputs ./.;