diff --git a/modules/nixos/meta/services.nix b/modules/nixos/meta/services.nix index e67e39f..fee970a 100644 --- a/modules/nixos/meta/services.nix +++ b/modules/nixos/meta/services.nix @@ -6,7 +6,7 @@ { name, ... }: { options = { - name = lib.mkOption { + title = lib.mkOption { type = lib.types.nonEmptyStr; default = name; }; diff --git a/modules/nixos/services/alertmanager.nix b/modules/nixos/services/alertmanager.nix index 3281dd4..977b3a5 100644 --- a/modules/nixos/services/alertmanager.nix +++ b/modules/nixos/services/alertmanager.nix @@ -102,7 +102,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "Alertmanager"; + title = "Alertmanager"; icon = "sh:prometheus"; }; }; diff --git a/modules/nixos/services/alloy.nix b/modules/nixos/services/alloy.nix index 71a3b10..24543d4 100644 --- a/modules/nixos/services/alloy.nix +++ b/modules/nixos/services/alloy.nix @@ -132,7 +132,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = lib.mkIf (cfg.domain != null) cfg.port; meta.services.${cfg.domain} = lib.mkIf (cfg.domain != null) { - name = "Alloy"; + title = "Alloy"; icon = "sh:grafana-alloy"; }; }; diff --git a/modules/nixos/services/prometheus.nix b/modules/nixos/services/prometheus.nix index 621d784..5139fe8 100644 --- a/modules/nixos/services/prometheus.nix +++ b/modules/nixos/services/prometheus.nix @@ -127,7 +127,7 @@ in persistence.directories = [ "/var/lib/${config.services.prometheus.stateDir}" ]; meta.services.${cfg.domain} = { - name = "Prometheus"; + title = "Prometheus"; icon = "sh:prometheus"; }; }; diff --git a/modules/nixos/services/syncthing.nix b/modules/nixos/services/syncthing.nix index 2a898b8..27703c0 100644 --- a/modules/nixos/services/syncthing.nix +++ b/modules/nixos/services/syncthing.nix @@ -172,7 +172,7 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.gui.domain} = lib.mkIf (cfg.gui.domain != null) { - name = "Syncthing"; + title = "Syncthing"; icon = "sh:syncthing"; }; }; diff --git a/modules/nixos/web-services/actualbudget.nix b/modules/nixos/web-services/actualbudget.nix index c416d9c..ec1a616 100644 --- a/modules/nixos/web-services/actualbudget.nix +++ b/modules/nixos/web-services/actualbudget.nix @@ -54,7 +54,7 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.domain} = { - name = "Actual Budget"; + title = "Actual Budget"; icon = "sh:actual-budget"; }; }; diff --git a/modules/nixos/web-services/atuin.nix b/modules/nixos/web-services/atuin.nix index 0f559a8..f655aae 100644 --- a/modules/nixos/web-services/atuin.nix +++ b/modules/nixos/web-services/atuin.nix @@ -49,7 +49,7 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.domain} = { - name = "Atuin"; + title = "Atuin"; icon = "sh:atuin"; }; }; diff --git a/modules/nixos/web-services/filebrowser.nix b/modules/nixos/web-services/filebrowser.nix index e22d440..1163d51 100644 --- a/modules/nixos/web-services/filebrowser.nix +++ b/modules/nixos/web-services/filebrowser.nix @@ -50,8 +50,8 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.domain} = { - name = "File Browser"; - icon = "sh:file-browser"; + title = "File Browser"; + icon = "sh:filebrowser"; }; }; }; diff --git a/modules/nixos/web-services/forgejo.nix b/modules/nixos/web-services/forgejo.nix index 57f546d..4a2083a 100644 --- a/modules/nixos/web-services/forgejo.nix +++ b/modules/nixos/web-services/forgejo.nix @@ -85,7 +85,7 @@ in persistence.directories = [ config.services.forgejo.stateDir ]; meta.services.${cfg.domain} = { - name = "Forgejo"; + title = "Forgejo"; icon = "sh:forgejo"; }; }; diff --git a/modules/nixos/web-services/freshrss.nix b/modules/nixos/web-services/freshrss.nix index bc0d591..bb749e6 100644 --- a/modules/nixos/web-services/freshrss.nix +++ b/modules/nixos/web-services/freshrss.nix @@ -51,7 +51,7 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.domain} = { - name = "FreshRSS"; + title = "FreshRSS"; icon = "sh:freshrss"; }; }; diff --git a/modules/nixos/web-services/gatus.nix b/modules/nixos/web-services/gatus.nix index 2e8a486..c1e049e 100644 --- a/modules/nixos/web-services/gatus.nix +++ b/modules/nixos/web-services/gatus.nix @@ -212,7 +212,7 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.domain} = { - name = "Gatus"; + title = "Gatus"; icon = "sh:gatus"; }; }; diff --git a/modules/nixos/web-services/glance.nix b/modules/nixos/web-services/glance.nix index 4df56e3..a14d1ea 100644 --- a/modules/nixos/web-services/glance.nix +++ b/modules/nixos/web-services/glance.nix @@ -21,19 +21,7 @@ let type = "monitor"; cache = "1m"; title = "Services - ${hostName}"; - sites = - services - |> lib.map ( - { - name, - url, - icon, - }: - { - title = name; - inherit url icon; - } - ); + sites = services; } ); in @@ -60,19 +48,16 @@ in name = "Home"; center-vertically = true; hide-desktop-navigation = true; + columns = lib.singleton { size = "full"; - widgets = [ - { + widgets = + lib.singleton { type = "search"; search-engine = "google"; autofocus = true; } - { - type = "split-column"; - widgets = servicesWidgets; - } - ]; + ++ servicesWidgets; }; }; }; @@ -82,7 +67,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "Glance"; + title = "Glance"; icon = "sh:glance"; }; }; diff --git a/modules/nixos/web-services/grafana.nix b/modules/nixos/web-services/grafana.nix index 74399c8..e3c3909 100644 --- a/modules/nixos/web-services/grafana.nix +++ b/modules/nixos/web-services/grafana.nix @@ -89,7 +89,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "Grafana"; + title = "Grafana"; icon = "sh:grafana"; }; }; diff --git a/modules/nixos/web-services/it-tools.nix b/modules/nixos/web-services/it-tools.nix index 857d59d..6ad12a2 100644 --- a/modules/nixos/web-services/it-tools.nix +++ b/modules/nixos/web-services/it-tools.nix @@ -21,7 +21,7 @@ in services.caddy.virtualHosts.${cfg.domain}.files = "${pkgs.it-tools}/lib"; meta.services.${cfg.domain} = { - name = "IT-Tools"; + title = "IT-Tools"; icon = "sh:it-tools"; }; }; diff --git a/modules/nixos/web-services/karakeep.nix b/modules/nixos/web-services/karakeep.nix index 5bfa705..a796faf 100644 --- a/modules/nixos/web-services/karakeep.nix +++ b/modules/nixos/web-services/karakeep.nix @@ -59,7 +59,7 @@ in ]; meta.services.${cfg.domain} = { - name = "Karakeep"; + title = "Karakeep"; icon = "sh:karakeep"; }; }; diff --git a/modules/nixos/web-services/networking-toolbox.nix b/modules/nixos/web-services/networking-toolbox.nix index 9015b29..fee4ba3 100644 --- a/modules/nixos/web-services/networking-toolbox.nix +++ b/modules/nixos/web-services/networking-toolbox.nix @@ -26,7 +26,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "Networking Toolbox"; + title = "Networking Toolbox"; icon = "sh:networking-toolbox"; }; }; diff --git a/modules/nixos/web-services/ntfy.nix b/modules/nixos/web-services/ntfy.nix index 19d604e..5067d4f 100644 --- a/modules/nixos/web-services/ntfy.nix +++ b/modules/nixos/web-services/ntfy.nix @@ -30,7 +30,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "ntfy"; + title = "ntfy"; icon = "sh:ntfy"; }; }; diff --git a/modules/nixos/web-services/outline.nix b/modules/nixos/web-services/outline.nix index 4da49f9..767c0e5 100644 --- a/modules/nixos/web-services/outline.nix +++ b/modules/nixos/web-services/outline.nix @@ -87,7 +87,7 @@ in ]; meta.services.${cfg.domain} = { - name = "Outline"; + title = "Outline"; icon = "sh:outline"; }; }; diff --git a/modules/nixos/web-services/personal-blog.nix b/modules/nixos/web-services/personal-blog.nix index a07cd0c..0683b54 100644 --- a/modules/nixos/web-services/personal-blog.nix +++ b/modules/nixos/web-services/personal-blog.nix @@ -31,7 +31,7 @@ in services.caddy.virtualHosts.${cfg.domain}.files = dataDir; meta.services.${cfg.domain} = { - name = "Blog"; + title = "Blog"; icon = "sh:zola"; }; }; diff --git a/modules/nixos/web-services/privatebin.nix b/modules/nixos/web-services/privatebin.nix index 7e9fcf0..a708bb6 100644 --- a/modules/nixos/web-services/privatebin.nix +++ b/modules/nixos/web-services/privatebin.nix @@ -41,7 +41,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "PrivateBin"; + title = "PrivateBin"; icon = "sh:privatebin"; }; }; diff --git a/modules/nixos/web-services/radicale.nix b/modules/nixos/web-services/radicale.nix index c2021aa..ab87975 100644 --- a/modules/nixos/web-services/radicale.nix +++ b/modules/nixos/web-services/radicale.nix @@ -111,7 +111,7 @@ in persistence.directories = [ dataDir ]; meta.services.${cfg.domain} = { - name = "Radicale"; + title = "Radicale"; icon = "sh:radicale"; }; }; diff --git a/modules/nixos/web-services/screego.nix b/modules/nixos/web-services/screego.nix index ffac102..1f8d820 100644 --- a/modules/nixos/web-services/screego.nix +++ b/modules/nixos/web-services/screego.nix @@ -30,7 +30,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "Screego"; + title = "Screego"; icon = "mdi:projector-screen-outline"; }; }; diff --git a/modules/nixos/web-services/stirling-pdf.nix b/modules/nixos/web-services/stirling-pdf.nix index 3d5bf5f..97382e4 100644 --- a/modules/nixos/web-services/stirling-pdf.nix +++ b/modules/nixos/web-services/stirling-pdf.nix @@ -44,7 +44,7 @@ in services.caddy.virtualHosts.${cfg.domain}.port = cfg.port; meta.services.${cfg.domain} = { - name = "Stirling PDF"; + title = "Stirling PDF"; icon = "sh:stirling-pdf"; }; };