From 8c549955c2188f86c75021f0a590e14f1421e373 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 22:25:57 +0100 Subject: [PATCH 1/8] glance: Group services by host --- modules/nixos/web-services/glance.nix | 31 ++++++++++++++------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/modules/nixos/web-services/glance.nix b/modules/nixos/web-services/glance.nix index 22c4328..2dfc8ed 100644 --- a/modules/nixos/web-services/glance.nix +++ b/modules/nixos/web-services/glance.nix @@ -28,30 +28,31 @@ in pages = lib.singleton { name = "Services"; - columns = [ - { - size = "full"; - widgets = [ + columns = lib.singleton { + size = "full"; + widgets = + allHosts + |> lib.attrValues + |> lib.map (host: { + hostName = host.config.networking.hostName; + domains = + host.config.custom.services.caddy.virtualHosts |> lib.attrValues |> lib.map (vHost: vHost.domain); + }) + |> lib.map ( + { hostName, domains }: { type = "monitor"; cache = "1m"; - title = "Services"; + title = "Services - ${hostName}"; sites = - allHosts - |> lib.attrValues - |> lib.map ( - host: - host.config.custom.services.caddy.virtualHosts |> lib.attrValues |> lib.map (vHost: vHost.domain) - ) - |> lib.concatLists + domains |> lib.map (domain: { title = domain; url = "https://${domain}"; }); } - ]; - } - ]; + ); + }; }; }; }; From 5cfb73e183bde3a843151110aa4b12decbf95f6a Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 22:44:43 +0100 Subject: [PATCH 2/8] glance: Only display hosts that have services --- modules/nixos/web-services/glance.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/web-services/glance.nix b/modules/nixos/web-services/glance.nix index 2dfc8ed..7655562 100644 --- a/modules/nixos/web-services/glance.nix +++ b/modules/nixos/web-services/glance.nix @@ -38,6 +38,7 @@ in domains = host.config.custom.services.caddy.virtualHosts |> lib.attrValues |> lib.map (vHost: vHost.domain); }) + |> lib.filter ({ domains, ... }: domains != [ ]) |> lib.map ( { hostName, domains }: { From 5cf56036d76b4713fcfb8c73bc1a082b75b9d7ac Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 23:10:08 +0100 Subject: [PATCH 3/8] glance: Improve services --- modules/nixos/meta/services.nix | 27 +++++++++++++++++++ modules/nixos/services/alertmanager.nix | 9 ++++++- modules/nixos/services/prometheus.nix | 5 ++++ modules/nixos/web-services/actualbudget.nix | 5 ++++ modules/nixos/web-services/atuin.nix | 5 ++++ modules/nixos/web-services/filebrowser.nix | 5 ++++ modules/nixos/web-services/forgejo.nix | 5 ++++ modules/nixos/web-services/freshrss.nix | 5 ++++ modules/nixos/web-services/gatus.nix | 5 ++++ modules/nixos/web-services/glance.nix | 23 ++++++++-------- modules/nixos/web-services/grafana.nix | 9 ++++++- modules/nixos/web-services/it-tools.nix | 9 ++++++- modules/nixos/web-services/karakeep.nix | 5 ++++ .../nixos/web-services/networking-toolbox.nix | 9 ++++++- modules/nixos/web-services/ntfy.nix | 9 ++++++- modules/nixos/web-services/outline.nix | 5 ++++ modules/nixos/web-services/personal-blog.nix | 9 ++++++- modules/nixos/web-services/privatebin.nix | 9 ++++++- modules/nixos/web-services/radicale.nix | 5 ++++ modules/nixos/web-services/screego.nix | 9 ++++++- modules/nixos/web-services/stirling-pdf.nix | 9 ++++++- 21 files changed, 161 insertions(+), 20 deletions(-) create mode 100644 modules/nixos/meta/services.nix diff --git a/modules/nixos/meta/services.nix b/modules/nixos/meta/services.nix new file mode 100644 index 0000000..e67e39f --- /dev/null +++ b/modules/nixos/meta/services.nix @@ -0,0 +1,27 @@ +{ 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 = { }; + }; +} diff --git a/modules/nixos/services/alertmanager.nix b/modules/nixos/services/alertmanager.nix index 4a2dcd8..5ada57d 100644 --- a/modules/nixos/services/alertmanager.nix +++ b/modules/nixos/services/alertmanager.nix @@ -98,6 +98,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "Alertmanager"; + icon = "di:alertmanager"; + }; + }; }; } diff --git a/modules/nixos/services/prometheus.nix b/modules/nixos/services/prometheus.nix index 7409dea..621d784 100644 --- a/modules/nixos/services/prometheus.nix +++ b/modules/nixos/services/prometheus.nix @@ -125,6 +125,11 @@ 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"; + }; }; }; } diff --git a/modules/nixos/web-services/actualbudget.nix b/modules/nixos/web-services/actualbudget.nix index fc80e34..c416d9c 100644 --- a/modules/nixos/web-services/actualbudget.nix +++ b/modules/nixos/web-services/actualbudget.nix @@ -52,6 +52,11 @@ in }; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = { + name = "Actual Budget"; + icon = "sh:actual-budget"; + }; }; }; } diff --git a/modules/nixos/web-services/atuin.nix b/modules/nixos/web-services/atuin.nix index 79bf168..0f559a8 100644 --- a/modules/nixos/web-services/atuin.nix +++ b/modules/nixos/web-services/atuin.nix @@ -47,6 +47,11 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = { + name = "Atuin"; + icon = "sh:atuin"; + }; }; }; } diff --git a/modules/nixos/web-services/filebrowser.nix b/modules/nixos/web-services/filebrowser.nix index c7d1821..7bbea0a 100644 --- a/modules/nixos/web-services/filebrowser.nix +++ b/modules/nixos/web-services/filebrowser.nix @@ -48,6 +48,11 @@ in }; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = { + name = "File Browser"; + icon = "sh:filebrowser"; + }; }; }; } diff --git a/modules/nixos/web-services/forgejo.nix b/modules/nixos/web-services/forgejo.nix index f657248..57f546d 100644 --- a/modules/nixos/web-services/forgejo.nix +++ b/modules/nixos/web-services/forgejo.nix @@ -83,6 +83,11 @@ in }; persistence.directories = [ config.services.forgejo.stateDir ]; + + meta.services.${cfg.domain} = { + name = "Forgejo"; + icon = "sh:forgejo"; + }; }; }; } diff --git a/modules/nixos/web-services/freshrss.nix b/modules/nixos/web-services/freshrss.nix index acae4e2..bc0d591 100644 --- a/modules/nixos/web-services/freshrss.nix +++ b/modules/nixos/web-services/freshrss.nix @@ -49,6 +49,11 @@ in }; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = { + name = "FreshRSS"; + icon = "sh:freshrss"; + }; }; }; } diff --git a/modules/nixos/web-services/gatus.nix b/modules/nixos/web-services/gatus.nix index 199c9a5..2e8a486 100644 --- a/modules/nixos/web-services/gatus.nix +++ b/modules/nixos/web-services/gatus.nix @@ -210,6 +210,11 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = { + name = "Gatus"; + icon = "sh:gatus"; + }; }; }; } diff --git a/modules/nixos/web-services/glance.nix b/modules/nixos/web-services/glance.nix index 7655562..c057b24 100644 --- a/modules/nixos/web-services/glance.nix +++ b/modules/nixos/web-services/glance.nix @@ -35,22 +35,16 @@ in |> lib.attrValues |> lib.map (host: { hostName = host.config.networking.hostName; - domains = - host.config.custom.services.caddy.virtualHosts |> lib.attrValues |> lib.map (vHost: vHost.domain); + services = host.config.custom.meta.services |> lib.attrValues; }) - |> lib.filter ({ domains, ... }: domains != [ ]) + |> lib.filter ({ services, ... }: services != [ ]) |> lib.map ( - { hostName, domains }: + { hostName, services }: { type = "monitor"; cache = "1m"; title = "Services - ${hostName}"; - sites = - domains - |> lib.map (domain: { - title = domain; - url = "https://${domain}"; - }); + sites = services; } ); }; @@ -58,6 +52,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "Glance"; + icon = "sh:glance"; + }; + }; }; } diff --git a/modules/nixos/web-services/grafana.nix b/modules/nixos/web-services/grafana.nix index 96913ec..74399c8 100644 --- a/modules/nixos/web-services/grafana.nix +++ b/modules/nixos/web-services/grafana.nix @@ -85,6 +85,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "Grafana"; + icon = "sh:grafana"; + }; + }; }; } diff --git a/modules/nixos/web-services/it-tools.nix b/modules/nixos/web-services/it-tools.nix index 00b2a02..857d59d 100644 --- a/modules/nixos/web-services/it-tools.nix +++ b/modules/nixos/web-services/it-tools.nix @@ -17,6 +17,13 @@ in }; config = lib.mkIf cfg.enable { - custom.services.caddy.virtualHosts.${cfg.domain}.files = "${pkgs.it-tools}/lib"; + custom = { + services.caddy.virtualHosts.${cfg.domain}.files = "${pkgs.it-tools}/lib"; + + meta.services.${cfg.domain} = { + name = "IT-Tools"; + icon = "sh:it-tools"; + }; + }; }; } diff --git a/modules/nixos/web-services/karakeep.nix b/modules/nixos/web-services/karakeep.nix index 19d1449..5bfa705 100644 --- a/modules/nixos/web-services/karakeep.nix +++ b/modules/nixos/web-services/karakeep.nix @@ -57,6 +57,11 @@ in "/var/lib/karakeep" "/var/lib/meilisearch" ]; + + meta.services.${cfg.domain} = { + name = "Karakeep"; + icon = "sh:karakeep"; + }; }; }; } diff --git a/modules/nixos/web-services/networking-toolbox.nix b/modules/nixos/web-services/networking-toolbox.nix index 96a2e41..9015b29 100644 --- a/modules/nixos/web-services/networking-toolbox.nix +++ b/modules/nixos/web-services/networking-toolbox.nix @@ -22,6 +22,13 @@ in pull = "newer"; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "Networking Toolbox"; + icon = "sh:networking-toolbox"; + }; + }; }; } diff --git a/modules/nixos/web-services/ntfy.nix b/modules/nixos/web-services/ntfy.nix index 9cc9dd1..19d604e 100644 --- a/modules/nixos/web-services/ntfy.nix +++ b/modules/nixos/web-services/ntfy.nix @@ -26,6 +26,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "ntfy"; + icon = "sh:ntfy"; + }; + }; }; } diff --git a/modules/nixos/web-services/outline.nix b/modules/nixos/web-services/outline.nix index fb662c6..4da49f9 100644 --- a/modules/nixos/web-services/outline.nix +++ b/modules/nixos/web-services/outline.nix @@ -85,6 +85,11 @@ in dataDir config.services.postgresql.dataDir ]; + + meta.services.${cfg.domain} = { + name = "Outline"; + icon = "sh:outline"; + }; }; }; } diff --git a/modules/nixos/web-services/personal-blog.nix b/modules/nixos/web-services/personal-blog.nix index 1930a2d..bd02150 100644 --- a/modules/nixos/web-services/personal-blog.nix +++ b/modules/nixos/web-services/personal-blog.nix @@ -27,6 +27,13 @@ in script = "nix build github:SebastianStork/blog --out-link ${dataDir} --refresh"; }; - custom.services.caddy.virtualHosts.${cfg.domain}.files = dataDir; + custom = { + services.caddy.virtualHosts.${cfg.domain}.files = dataDir; + + meta.services.${cfg.domain} = { + name = "Blog"; + icon = "sh:ghost"; + }; + }; }; } diff --git a/modules/nixos/web-services/privatebin.nix b/modules/nixos/web-services/privatebin.nix index 7285fa9..7e9fcf0 100644 --- a/modules/nixos/web-services/privatebin.nix +++ b/modules/nixos/web-services/privatebin.nix @@ -37,6 +37,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "PrivateBin"; + icon = "sh:privatebin"; + }; + }; }; } diff --git a/modules/nixos/web-services/radicale.nix b/modules/nixos/web-services/radicale.nix index 7489834..c2021aa 100644 --- a/modules/nixos/web-services/radicale.nix +++ b/modules/nixos/web-services/radicale.nix @@ -109,6 +109,11 @@ in }; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = { + name = "Radicale"; + icon = "sh:radicale"; + }; }; }; } diff --git a/modules/nixos/web-services/screego.nix b/modules/nixos/web-services/screego.nix index 7a1d554..fb50c30 100644 --- a/modules/nixos/web-services/screego.nix +++ b/modules/nixos/web-services/screego.nix @@ -26,6 +26,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "Screego"; + icon = "sh:screego"; + }; + }; }; } diff --git a/modules/nixos/web-services/stirling-pdf.nix b/modules/nixos/web-services/stirling-pdf.nix index a0efb72..3d5bf5f 100644 --- a/modules/nixos/web-services/stirling-pdf.nix +++ b/modules/nixos/web-services/stirling-pdf.nix @@ -40,6 +40,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + custom = { + services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; + + meta.services.${cfg.domain} = { + name = "Stirling PDF"; + icon = "sh:stirling-pdf"; + }; + }; }; } From e15485a60eaad89a3c71ba6bea4d725ee4b5291a Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 23:14:19 +0100 Subject: [PATCH 4/8] glane: Fix titles --- modules/nixos/web-services/glance.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/nixos/web-services/glance.nix b/modules/nixos/web-services/glance.nix index c057b24..42de319 100644 --- a/modules/nixos/web-services/glance.nix +++ b/modules/nixos/web-services/glance.nix @@ -44,7 +44,19 @@ in type = "monitor"; cache = "1m"; title = "Services - ${hostName}"; - sites = services; + sites = + services + |> lib.map ( + { + name, + url, + icon, + }: + { + title = name; + inherit url icon; + } + ); } ); }; From b3a1a8bb4169c2dcb601d156bfc18ce4e0068e9e Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 23:23:47 +0100 Subject: [PATCH 5/8] glance: Fine tune icons --- modules/nixos/services/alertmanager.nix | 2 +- modules/nixos/web-services/filebrowser.nix | 2 +- modules/nixos/web-services/personal-blog.nix | 2 +- modules/nixos/web-services/screego.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/nixos/services/alertmanager.nix b/modules/nixos/services/alertmanager.nix index 5ada57d..105b830 100644 --- a/modules/nixos/services/alertmanager.nix +++ b/modules/nixos/services/alertmanager.nix @@ -103,7 +103,7 @@ in meta.services.${cfg.domain} = { name = "Alertmanager"; - icon = "di:alertmanager"; + icon = "sh:alertmanager"; }; }; }; diff --git a/modules/nixos/web-services/filebrowser.nix b/modules/nixos/web-services/filebrowser.nix index 7bbea0a..e22d440 100644 --- a/modules/nixos/web-services/filebrowser.nix +++ b/modules/nixos/web-services/filebrowser.nix @@ -51,7 +51,7 @@ in meta.services.${cfg.domain} = { name = "File Browser"; - icon = "sh:filebrowser"; + icon = "sh:file-browser"; }; }; }; diff --git a/modules/nixos/web-services/personal-blog.nix b/modules/nixos/web-services/personal-blog.nix index bd02150..a07cd0c 100644 --- a/modules/nixos/web-services/personal-blog.nix +++ b/modules/nixos/web-services/personal-blog.nix @@ -32,7 +32,7 @@ in meta.services.${cfg.domain} = { name = "Blog"; - icon = "sh:ghost"; + icon = "sh:zola"; }; }; }; diff --git a/modules/nixos/web-services/screego.nix b/modules/nixos/web-services/screego.nix index fb50c30..ffac102 100644 --- a/modules/nixos/web-services/screego.nix +++ b/modules/nixos/web-services/screego.nix @@ -31,7 +31,7 @@ in meta.services.${cfg.domain} = { name = "Screego"; - icon = "sh:screego"; + icon = "mdi:projector-screen-outline"; }; }; }; From 7163a31175e7523ef09923ec81c2c263b3aeb7a6 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 23:24:58 +0100 Subject: [PATCH 6/8] glance: Fix alertmanager icon --- modules/nixos/services/alertmanager.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/alertmanager.nix b/modules/nixos/services/alertmanager.nix index 105b830..3281dd4 100644 --- a/modules/nixos/services/alertmanager.nix +++ b/modules/nixos/services/alertmanager.nix @@ -103,7 +103,7 @@ in meta.services.${cfg.domain} = { name = "Alertmanager"; - icon = "sh:alertmanager"; + icon = "sh:prometheus"; }; }; }; From 8fe5ef9e76eae3389556fe8dcd77e71220c177e7 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 23:30:50 +0100 Subject: [PATCH 7/8] glance: Add alloy and syncthing --- modules/nixos/services/alloy.nix | 9 ++++++++- modules/nixos/services/syncthing.nix | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/nixos/services/alloy.nix b/modules/nixos/services/alloy.nix index e22a3c5..6bcb8cb 100644 --- a/modules/nixos/services/alloy.nix +++ b/modules/nixos/services/alloy.nix @@ -128,6 +128,13 @@ in }; }; - custom.services.caddy.virtualHosts.${cfg.domain}.port = lib.mkIf (cfg.domain != null) cfg.port; + custom = { + 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"; + }; + }; }; } diff --git a/modules/nixos/services/syncthing.nix b/modules/nixos/services/syncthing.nix index 9427643..d6c15bf 100644 --- a/modules/nixos/services/syncthing.nix +++ b/modules/nixos/services/syncthing.nix @@ -170,6 +170,11 @@ in }; persistence.directories = [ dataDir ]; + + meta.services.${cfg.domain} = lib.mkIf (cfg.gui.domain != null) { + name = "Syncthing"; + icon = "sh:syncthing"; + }; }; }; } From f38cb764e0cf851f551a8a563ecdc022f1abd465 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Mon, 9 Mar 2026 23:32:17 +0100 Subject: [PATCH 8/8] glance: Fix syncthing --- modules/nixos/services/syncthing.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/syncthing.nix b/modules/nixos/services/syncthing.nix index d6c15bf..2a898b8 100644 --- a/modules/nixos/services/syncthing.nix +++ b/modules/nixos/services/syncthing.nix @@ -171,7 +171,7 @@ in persistence.directories = [ dataDir ]; - meta.services.${cfg.domain} = lib.mkIf (cfg.gui.domain != null) { + meta.services.${cfg.gui.domain} = lib.mkIf (cfg.gui.domain != null) { name = "Syncthing"; icon = "sh:syncthing"; };