Merge pull request 'fix(homepage): merge service groups by name to stop manual entries being dropped' (#14 ) from fix/homepage-duplicate-service-groups into main

Reviewed-on: #14
fix(homepage): merge service groups by name to stop manual entries being dropped
2026-09-21 15:29:59 +02:00 · 2026-09-21 15:27:07 +02:00
1 changed files with 78 additions and 64 deletions
@@ -12,79 +12,93 @@ let
  manualServices = import ./manual-services.nix;
  manualWidgets = import ./manual-widgets.nix;

-  groupedServices =
-    lib.foldl'
-      (
-        acc: entry:
-        acc
-        // {
-          ${entry.group} = (acc.${entry.group} or [ ]) ++ [ entry ];
-        }
-      )
-      { }
-      config.my.homepage.services;
-
-  homepageServices = lib.mapAttrsToList (
-    group: entries:
-    {
-      ${group} = map (
-        entry:
-        let
-          service = builtins.removeAttrs entry [
-            "group"
-            "name"
-          ];
-        in
-        {
-          ${entry.name} = lib.filterAttrs (_: value: value != null) service;
-        }
-      ) entries;
+  groupedServices = lib.foldl' (
+    acc: entry:
+    acc
+    // {
+      ${entry.group} = (acc.${entry.group} or [ ]) ++ [ entry ];
    }
-  ) groupedServices;
+  ) { } config.my.homepage.services;
+
+  homepageServices = lib.mapAttrsToList (group: entries: {
+    ${group} = map (
+      entry:
+      let
+        service = builtins.removeAttrs entry [
+          "group"
+          "name"
+        ];
+      in
+      {
+        ${entry.name} = lib.filterAttrs (_: value: value != null) service;
+      }
+    ) entries;
+  }) groupedServices;
+
+  # homepage-dashboard keeps only the first services.yaml list entry with a
+  # given group name (first match wins), so module-contributed and manual
+  # groups sharing a name (e.g. "Services") must be merged here rather than
+  # simply concatenated, or the later ones are silently dropped.
+  mergeGroups =
+    lists:
+    let
+      merged = lib.foldl' (
+        acc: groupAttrs:
+        let
+          groupName = builtins.head (builtins.attrNames groupAttrs);
+        in
+        acc // { ${groupName} = (acc.${groupName} or [ ]) ++ groupAttrs.${groupName}; }
+      ) { } lists;
+    in
+    lib.mapAttrsToList (name: entries: { ${name} = entries; }) merged;
 in
 {

-  options.my.homepage.services = with lib; mkOption {
-    type = types.listOf (
-      types.submodule {
-        options = {
-          group = mkOption {
-            type = types.str;
-            description = "Homepage service group";
-          };
+  options.my.homepage.services =
+    with lib;
+    mkOption {
+      type = types.listOf (
+        types.submodule {
+          options = {
+            group = mkOption {
+              type = types.str;
+              description = "Homepage service group";
+            };

-          name = mkOption {
-            type = types.str;
-            description = "Homepage service name";
-          };
+            name = mkOption {
+              type = types.str;
+              description = "Homepage service name";
+            };

-          description = mkOption {
-            type = types.str;
-            description = "Homepage service description";
-          };
+            description = mkOption {
+              type = types.str;
+              description = "Homepage service description";
+            };

-          href = mkOption {
-            type = types.str;
-            description = "Homepage service URL";
-          };
+            href = mkOption {
+              type = types.str;
+              description = "Homepage service URL";
+            };

-          icon = mkOption {
-            type = types.nullOr types.str;
-            default = null;
-            description = "Optional Homepage service icon";
+            icon = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = "Optional Homepage service icon";
+            };
          };
-        };
-      }
-    );
-    default = [ ];
-    description = "Merged homepage service metadata contributed by repo modules.";
-  };
+        }
+      );
+      default = [ ];
+      description = "Merged homepage service metadata contributed by repo modules.";
+    };

-  options.my.homepage.widgets = with lib; mkOption {
-    type = types.listOf types.attrs;
-    default = [ ];
-    description = "Widget definitions passed directly to services.homepage-dashboard.widgets. Each entry is an attrset like { resources = { cpu = true; memory = true; }; }.";
-  };
+  options.my.homepage.widgets =
+    with lib;
+    mkOption {
+      type = types.listOf types.attrs;
+      default = [ ];
+      description = "Widget definitions passed directly to services.homepage-dashboard.widgets. Each entry is an attrset like { resources = { cpu = true; memory = true; }; }.";
+    };

  options.my.profiles.homepage = with lib; {
    enable = mkEnableOption "getHomepage.dev Dashboard";
@@ -98,7 +112,7 @@ in
      listenPort = dashboardPort;
      allowedHosts = "${dashboardHost}:${toString dashboardPort},192.168.178.65:${toString dashboardPort},localhost:${toString dashboardPort},127.0.0.1:${toString dashboardPort},jupiter:${toString dashboardPort},jupiter.solar.internal:${toString dashboardPort}";
      bookmarks = import ./bookmarks.nix;
-      services = homepageServices ++ manualServices;
+      services = mergeGroups (homepageServices ++ manualServices);
      widgets = config.my.homepage.widgets ++ manualWidgets;
    };