From 686390149fb250054fea5de87a068adc44b0e394 Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 23 Jan 2024 00:21:50 +0900 Subject: feat(flake): generate colmena from nixosConfigurations --- lib/mk_system.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'lib/mk_system.nix') diff --git a/lib/mk_system.nix b/lib/mk_system.nix index 2aca550..ff51fef 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -28,13 +28,15 @@ ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } ++ nixpkgs.lib.optionals (extraModules != null) extraModules; } - entryPoint - hardware - # TODO: import all modules (use mapModules?) - ../modules/flakes.nix - ../modules/nix.nix - ../modules/nixpkgs.nix - ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } - ++ nixpkgs.lib.optionals (extraModules != null) extraModules; - } -) + ); + + mkColmenaFromNixOSConfigurations = conf: + { + meta = { + # Colmena requirement. Will be overridden in nodeNixpkgs. + nixpkgs = import unstable { system = "x86_64-linux"; }; + nodeNixpkgs = builtins.mapAttrs (_: value: value.pkgs) conf; + nodeSpecialArgs = builtins.mapAttrs (_: value: value._module.specialArgs) conf; + }; + } // builtins.mapAttrs (_: value: { imports = value._module.args.modules; }) conf; +} -- cgit 1.4.1