TODO.md

@@ -27,8 +27,8 @@
 - [ ] allow multiple privesc methods, the standard is pam_ssh_agent_auth
 
 ## Low Priority
-- [X] rename extraModules to modules?
-- [X] rename specialArgs to args?
+- [ ] rename extraModules to modules?
+- [ ] rename specialArgs to args?
 
 - [ ] make an extension to the nix module system (different to mix)
       that allows transformations (ie a stop post config, ie outputs, which
@@ -44,8 +44,6 @@
 - [ ] rewrite the ceru cli in rust
 - [ ] make `ceru` do local and remote deployments
 
-- [ ] support `legacyImports` 
-
 ```nix
 # REF: foxora
 vms = {

cerulean/nexus/nexus.nix

@@ -93,13 +93,13 @@
       Cerulean Nexus config must be provided as an attribute set, got "${typeOf nexus}" instead!
       Ensure the `nexus` declaration is an attribute set under your call to `cerulean.mkNexus`.
     ''; let
-      decl = nt.projectOnto templateNexus nexus;
+      base = nt.projectOnto templateNexus nexus;
     in
       # XXX: TODO: create a different version of nt.projectOnto that can actually
       # XXX: TODO: handle applying a transformation to the result of each datapoint
-      decl
+      base
       // {
-        groups = parseGroupDecl decl.groups;
+        groups = parseGroupDecl base.groups;
       };
 
   parseDecl = outputsBuilder: let

cerulean/nixos/nixpkgs.nix

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 {
-  base,
   lib,
   system,
   config,
@@ -74,16 +73,17 @@ in {
   in {
     # NOTE: _module.args is a special option that allows us to
     # NOTE: set extend specialArgs from inside the modules.
-    # WARNING: pkgs is a reserved specialArg
-    _module.args = removeAttrs repos ["pkgs"];
+    _module.args = repos;
 
     nixpkgs =
       if contextName == "hosts"
-      then {
-        flake.source = lib.mkOverride 200 base; # DEBUG: temp while getting base to work
-        overlays = lib.mkOverride 200 (defaultPkgs.overlays or {});
-        config = lib.mkOverride 200 (defaultPkgs.config or {});
-      }
+      then
+        # DEBUG: defaultPkgs
+        {
+          flake.source = lib.mkOverride 200 (defaultPkgs.source or null);
+          overlays = lib.mkOverride 200 (defaultPkgs.overlays or {});
+          config = lib.mkOverride 200 (defaultPkgs.config or {});
+        }
       else if contextName == "homes"
       then {
         config = lib.mkOverride 200 (defaultPkgs.config or {});