diff --git a/cerulean/default.nix b/cerulean/default.nix index 202fdf9..f24bb5a 100644 --- a/cerulean/default.nix +++ b/cerulean/default.nix @@ -21,7 +21,7 @@ mix.newMixture args (mixture: { ./nexus ]; - version = "0.2.2"; + version = "0.2.1"; nixosModules = rec { default = cerulean; diff --git a/cerulean/nexus/nexus.nix b/cerulean/nexus/nexus.nix index 22424ba..24a0b75 100644 --- a/cerulean/nexus/nexus.nix +++ b/cerulean/nexus/nexus.nix @@ -51,8 +51,8 @@ ; in { base = null; - modules = []; - args = Terminal {}; + extraModules = []; + specialArgs = Terminal {}; groups = Terminal {}; nodes = Terminal {}; @@ -189,16 +189,19 @@ in { node, ... }: let - nixosDecl = lib.nixosSystem rec { + nixosDecl = lib.nixosSystem { system = node.system; - specialArgs = - nexus.args - // node.args - // { - inherit root specialArgs; - inherit (node) system; - _deploy-rs = inputs.deploy-rs; - }; + specialArgs = let + specialArgs = + nexus.specialArgs + // node.specialArgs + // { + inherit root specialArgs; + inherit (node) system; + _deploy-rs = inputs.deploy-rs; + }; + in + specialArgs; modules = [ self.nixosModules.default @@ -208,8 +211,8 @@ in { # inputs.microvm.nixosModules.microvm ] ++ (getGroupModules root nodeName node) - ++ node.modules - ++ nexus.modules; + ++ node.extraModules + ++ nexus.extraModules; }; in nixosDecl diff --git a/cerulean/nexus/nodes.nix b/cerulean/nexus/nodes.nix index a1b6117..ccb5c20 100644 --- a/cerulean/nexus/nodes.nix +++ b/cerulean/nexus/nodes.nix @@ -35,8 +35,8 @@ in rec { enabled = true; system = missing "its system architecture" "system"; groups = []; - modules = []; - args = Terminal {}; + extraModules = []; + specialArgs = Terminal {}; base = null; diff --git a/cerulean/nexus/snow.nix b/cerulean/nexus/snow.nix index 28496ca..1316ee3 100644 --- a/cerulean/nexus/snow.nix +++ b/cerulean/nexus/snow.nix @@ -24,10 +24,10 @@ types ; in { - modules = mkOption { + extraModules = mkOption { type = types.listOf types.path; }; - args = mkOption { + specialArgs = mkOption { type = types.attrs; };