modules/nixos/meta/services.nix

@@ -1,27 +0,0 @@
-{ lib, ... }:
-{
-  options.custom.meta.services = lib.mkOption {
-    type = lib.types.attrsOf (
-      lib.types.submodule (
-        { name, ... }:
-        {
-          options = {
-            name = lib.mkOption {
-              type = lib.types.nonEmptyStr;
-              default = name;
-            };
-            url = lib.mkOption {
-              type = lib.types.nonEmptyStr;
-              default = "https://${name}";
-            };
-            icon = lib.mkOption {
-              type = lib.types.nonEmptyStr;
-              default = "";
-            };
-          };
-        }
-      )
-    );
-    default = { };
-  };
-}

modules/nixos/services/alertmanager.nix

@@ -98,13 +98,6 @@ in
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "Alertmanager";
-        icon = "sh:prometheus";
-      };
-    };
   };
 }

modules/nixos/services/alloy.nix

@@ -128,13 +128,6 @@ in
         };
       };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = lib.mkIf (cfg.domain != null) cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = lib.mkIf (cfg.domain != null) cfg.port;
-
-      meta.services.${cfg.domain} = lib.mkIf (cfg.domain != null) {
-        name = "Alloy";
-        icon = "sh:alloy";
-      };
-    };
   };
 }

modules/nixos/services/prometheus.nix

@@ -125,11 +125,6 @@ in
       services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
 
       persistence.directories = [ "/var/lib/${config.services.prometheus.stateDir}" ];
-
-      meta.services.${cfg.domain} = {
-        name = "Prometheus";
-        icon = "sh:prometheus";
-      };
     };
   };
 }

modules/nixos/services/syncthing.nix

@@ -170,11 +170,6 @@ in
       };
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.gui.domain} = lib.mkIf (cfg.gui.domain != null) {
-        name = "Syncthing";
-        icon = "sh:syncthing";
-      };
     };
   };
 }

modules/nixos/web-services/actualbudget.nix

@@ -52,11 +52,6 @@ in
       };
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "Actual Budget";
-        icon = "sh:actual-budget";
-      };
     };
   };
 }

modules/nixos/web-services/atuin.nix

@@ -47,11 +47,6 @@ in
       services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "Atuin";
-        icon = "sh:atuin";
-      };
     };
   };
 }

modules/nixos/web-services/filebrowser.nix

@@ -48,11 +48,6 @@ in
       };
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "File Browser";
-        icon = "sh:file-browser";
-      };
     };
   };
 }

modules/nixos/web-services/forgejo.nix

@@ -83,11 +83,6 @@ in
       };
 
       persistence.directories = [ config.services.forgejo.stateDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "Forgejo";
-        icon = "sh:forgejo";
-      };
     };
   };
 }

modules/nixos/web-services/freshrss.nix

@@ -49,11 +49,6 @@ in
       };
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "FreshRSS";
-        icon = "sh:freshrss";
-      };
     };
   };
 }

modules/nixos/web-services/gatus.nix

@@ -210,11 +210,6 @@ in
       services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "Gatus";
-        icon = "sh:gatus";
-      };
     };
   };
 }

modules/nixos/web-services/glance.nix

@@ -28,49 +28,34 @@ in
 
         pages = lib.singleton {
           name = "Services";
-          columns = lib.singleton {
+          columns = [
-            size = "full";
+            {
-            widgets =
+              size = "full";
-              allHosts
+              widgets = [
-              |> lib.attrValues
-              |> lib.map (host: {
-                hostName = host.config.networking.hostName;
-                services = host.config.custom.meta.services |> lib.attrValues;
-              })
-              |> lib.filter ({ services, ... }: services != [ ])
-              |> lib.map (
-                { hostName, services }:
                 {
                   type = "monitor";
                   cache = "1m";
-                  title = "Services - ${hostName}";
+                  title = "Services";
                   sites =
-                    services
+                    allHosts
+                    |> lib.attrValues
                     |> lib.map (
-                      {
+                      host:
-                        name,
+                      host.config.custom.services.caddy.virtualHosts |> lib.attrValues |> lib.map (vHost: vHost.domain)
-                        url,
+                    )
-                        icon,
+                    |> lib.concatLists
-                      }:
+                    |> lib.map (domain: {
-                      {
+                      title = domain;
-                        title = name;
+                      url = "https://${domain}";
-                        inherit url icon;
+                    });
-                      }
-                    );
                 }
-              );
+              ];
-          };
+            }
+          ];
         };
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "Glance";
-        icon = "sh:glance";
-      };
-    };
   };
 }

modules/nixos/web-services/grafana.nix

@@ -85,13 +85,6 @@ in
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "Grafana";
-        icon = "sh:grafana";
-      };
-    };
   };
 }

modules/nixos/web-services/it-tools.nix

@@ -17,13 +17,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.files = "${pkgs.it-tools}/lib";
-      services.caddy.virtualHosts.${cfg.domain}.files = "${pkgs.it-tools}/lib";
-
-      meta.services.${cfg.domain} = {
-        name = "IT-Tools";
-        icon = "sh:it-tools";
-      };
-    };
   };
 }

modules/nixos/web-services/karakeep.nix

@@ -57,11 +57,6 @@ in
         "/var/lib/karakeep"
         "/var/lib/meilisearch"
       ];
-
-      meta.services.${cfg.domain} = {
-        name = "Karakeep";
-        icon = "sh:karakeep";
-      };
     };
   };
 }

modules/nixos/web-services/networking-toolbox.nix

@@ -22,13 +22,6 @@ in
       pull = "newer";
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "Networking Toolbox";
-        icon = "sh:networking-toolbox";
-      };
-    };
   };
 }

modules/nixos/web-services/ntfy.nix

@@ -26,13 +26,6 @@ in
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "ntfy";
-        icon = "sh:ntfy";
-      };
-    };
   };
 }

modules/nixos/web-services/outline.nix

@@ -85,11 +85,6 @@ in
           dataDir
           config.services.postgresql.dataDir
         ];
-
-        meta.services.${cfg.domain} = {
-          name = "Outline";
-          icon = "sh:outline";
-        };
       };
   };
 }

modules/nixos/web-services/personal-blog.nix

@@ -27,13 +27,6 @@ in
       script = "nix build github:SebastianStork/blog --out-link ${dataDir} --refresh";
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.files = dataDir;
-      services.caddy.virtualHosts.${cfg.domain}.files = dataDir;
-
-      meta.services.${cfg.domain} = {
-        name = "Blog";
-        icon = "sh:zola";
-      };
-    };
   };
 }

modules/nixos/web-services/privatebin.nix

@@ -37,13 +37,6 @@ in
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "PrivateBin";
-        icon = "sh:privatebin";
-      };
-    };
   };
 }

modules/nixos/web-services/radicale.nix

@@ -109,11 +109,6 @@ in
       };
 
       persistence.directories = [ dataDir ];
-
-      meta.services.${cfg.domain} = {
-        name = "Radicale";
-        icon = "sh:radicale";
-      };
     };
   };
 }

modules/nixos/web-services/screego.nix

@@ -26,13 +26,6 @@ in
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "Screego";
-        icon = "mdi:projector-screen-outline";
-      };
-    };
   };
 }

modules/nixos/web-services/stirling-pdf.nix

@@ -40,13 +40,6 @@ in
       };
     };
 
-    custom = {
+    custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-      services.caddy.virtualHosts.${cfg.domain}.port = cfg.port;
-
-      meta.services.${cfg.domain} = {
-        name = "Stirling PDF";
-        icon = "sh:stirling-pdf";
-      };
-    };
   };
 }