Refactor desktop HM into desktop-home-base and per-host home.nix

2026-06-07 17:02:25 -03:00
parent 73401750a0
commit cea0050597
20 changed files with 259 additions and 239 deletions
@@ -23,11 +23,24 @@
          '';
        };
        extraModules = lib.mkOption {
-          type = lib.types.attrsOf (lib.types.listOf lib.types.unspecified);
+          type =
+            (lib.types.attrsOf (lib.types.listOf lib.types.unspecified))
+            // {
+              merge =
+                loc: defs:
+                let
+                  values = map (d: d.value) defs;
+                  names = lib.unique (lib.concatLists (map builtins.attrNames values));
+                in
+                lib.genAttrs names (
+                  name: lib.concatLists (map (v: v.${name} or [ ]) values)
+                );
+            };
          default = { };
          description = ''
            Per-user Home Manager `extraModules` keyed by catalog user name.
-            Keys must match `chiasson.users.enabled`.
+            Keys must match `chiasson.users.enabled`. Lists from multiple modules
+            are concatenated (e.g. `desktop-home-base.nix` + host `home.nix`).
          '';
        };
        homeManager = {