diff --git a/nix/modules/home-manager.nix b/nix/modules/home-manager.nix index e81050f..2d6bf83 100644 --- a/nix/modules/home-manager.nix +++ b/nix/modules/home-manager.nix @@ -1,13 +1,18 @@ -{ inputs, ... }: +{ inputs, config, ... }: let + inherit (cfg.lib) flattenAttrs; + cfg = config.flake; hm = inputs.home-manager; globalCfg = { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + useGlobalPkgs = true; + useUserPackages = true; + sharedModules = [ + (flattenAttrs (cfg.modules.homeManager or { })) + ]; }; in { imports = [ hm.flakeModules.home-manager ]; flake.modules.nixos.default.imports = [ hm.nixosModules.home-manager ]; - flake.modules.nixos.default.config = globalCfg; + flake.modules.nixos.default.config.home-manager = globalCfg; } diff --git a/nix/configurations.nix b/nix/modules/hosts.nix similarity index 100% rename from nix/configurations.nix rename to nix/modules/hosts.nix