diff --git a/TODO.md b/TODO.md index 7a23e43..5fff9a2 100755 --- a/TODO.md +++ b/TODO.md @@ -1,7 +1,4 @@ ## Next -- [ ] formalize how the snow flake system compiles outputs, this would remove the need for `mapNodes` -- [ ] groups should allow you to set node configuration defaults - - [ ] add `options.experimental` for snowflake - [ ] add `legacyImports` support diff --git a/cerulean/snow/default.nix b/cerulean/snow/default.nix index 6993ff1..c1199a6 100644 --- a/cerulean/snow/default.nix +++ b/cerulean/snow/default.nix @@ -48,22 +48,16 @@ in class = "snowflake"; # TODO: abort if inputs contains reserved names specialArgs = - (flakeInputs - // { - inherit systems root; - inherit (this) snow; - inputs = flakeInputs; - }) - |> (x: builtins.removeAttrs x ["self" "nodes"]); + flakeInputs + // { + inherit root; + inherit systems; + inherit (this) snow; # please don't be infinite recursion... + inputs = flakeInputs; + }; modules = [ ./module.nix - ({config, ...}: { - _module.args = { - self = config; - nodes = config.nodes.nodes; - }; - }) ]; }; @@ -92,7 +86,7 @@ in userArgs = nodes.args // node.args; ceruleanArgs = { - inherit systems root base nodes node; + inherit systems root base node; inherit (node) system; inherit (this) snow; hostname = name;