From 870bbb1f3738736ea248c171685bffdb242e294a Mon Sep 17 00:00:00 2001
From: _cry64 <them@dobutterfliescry.net>
Date: Wed, 18 Feb 2026 17:24:28 +1000
Subject: [PATCH] i cried

---
 cerulean/nexus/nexus.nix        |  6 +++---
 cerulean/nixos/home-manager.nix | 30 +++++++++++++++---------------
 cerulean/nixos/nixpkgs.nix      | 32 +++++++++++++++++---------------
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/cerulean/nexus/nexus.nix b/cerulean/nexus/nexus.nix
index b30647d..f3cf38a 100644
--- a/cerulean/nexus/nexus.nix
+++ b/cerulean/nexus/nexus.nix
@@ -197,8 +197,8 @@ in {
               inherit root base;
               inherit (node) system;
               _cerulean = {
-                inherit inputs userArgs;
-                args = ceruleanArgs;
+                inherit inputs userArgs ceruleanArgs;
+                specialArgs = userArgs // ceruleanArgs;
               };
             };
             specialArgs = assert (userArgs
@@ -209,7 +209,7 @@ in {
                   `specialArgs` are like super important to Cerulean my love... </3
                   But `args.${argName}` is a reserved argument name :(
                 ''));
-              userArgs // ceruleanArgs;
+              ceruleanArgs._cerulean.specialArgs;
           in
             lib.nixosSystem {
               inherit (node) system;
diff --git a/cerulean/nixos/home-manager.nix b/cerulean/nixos/home-manager.nix
index 7c3d12d..1d281cb 100644
--- a/cerulean/nixos/home-manager.nix
+++ b/cerulean/nixos/home-manager.nix
@@ -25,21 +25,21 @@
     pathExists
     ;
 in {
-  config = {
-    home-manager = {
-      users =
-        config.users.users
-        |> attrNames
-        |> filter (x: pathExists (root + "/homes/${x}"))
-        |> (x: lib.genAttrs x (y: import (root + "/homes/${y}")));
+  home-manager = {
+    users =
+      config.users.users
+      |> attrNames
+      |> filter (x: pathExists (root + "/homes/${x}"))
+      |> (x:
+        lib.genAttrs x (y:
+          import (root + "/homes/${y}")));
 
-      extraSpecialArgs = _cerulean.args;
-      sharedModules = [
-        # user configuration
-        (import (root + "/nixpkgs.nix"))
-        # options declarations
-        (import ./nixpkgs.nix (args // {contextName = "homes";}))
-      ];
-    };
+    extraSpecialArgs = _cerulean.specialArgs;
+    sharedModules = [
+      # user configuration
+      (import (root + "/nixpkgs.nix"))
+      # options declarations
+      (import ./nixpkgs.nix (args // {contextName = "homes";}))
+    ];
   };
 }
diff --git a/cerulean/nixos/nixpkgs.nix b/cerulean/nixos/nixpkgs.nix
index 41ee0ab..b43dbbc 100644
--- a/cerulean/nixos/nixpkgs.nix
+++ b/cerulean/nixos/nixpkgs.nix
@@ -52,6 +52,7 @@ in {
   config = let
     repos =
       cfg
+      |> (xs: removeAttrs xs ["default"])
       |> mapAttrs (
         name: args:
           lib.mkForce (
@@ -59,29 +60,30 @@ in {
             || abort ''
               `nixpkgs.channels.${name}` missing required attribute "source"
             '';
-              ((removeAttrs args ["source"])
-                // {inherit system;})
-              |> import args.source
+              import args.source ({inherit system;} // (removeAttrs args ["source"]))
           )
       );
+
+    # XXX: TODO: would it work to use `base` instead of having default?
+    defaultPkgs =
+      cfg.default or (throw ''
+        Your `nixpkgs.nix` file does not declare a default package source.
+        Ensure you set `nixpkgs.channels.*.default = ...;`
+      '');
   in {
     # NOTE: _module.args is a special option that allows us to
     # NOTE: set extend specialArgs from inside the modules.
     _module.args = repos;
 
-    nixpkgs = let
-      # XXX: TODO: would it work to use `base` instead of having default?
-      defaultPkgs =
-        cfg.default or (throw ''
-          Your `nixpkgs.nix` file does not declare a default package source.
-          Ensure you set `nixpkgs.channels.*.default = ...;`
-        '');
-    in
+    nixpkgs =
       if contextName == "hosts"
-      then {
-        flake.source = lib.mkOverride 200 defaultPkgs.source;
-        config = lib.mkOverride 200 defaultPkgs.config;
-      }
+      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 {});