refactor: abstracting out bookmark info

modules/config/default.nix

@@ -56,6 +56,7 @@ let
       subdomain = stringType;
       label = stringType;
       name = stringType;
+      short = stringType;
       hostname = stringType;
       tags = listType;
       domains = genOptions stringType "url";

modules/config/instances/config/audiobookshelf.nix

@@ -14,6 +14,7 @@ in
 {
   label = audiobookshelfLabel;
   name = audiobookshelfName;
+  short = "Books";
   sops = {
     path0 = "${sopsPath}/${audiobookshelfName}";
   };

modules/config/instances/config/forgejo.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = label;
   email = {
     address0 = "noreply@${domain3}";
   };

modules/config/instances/config/glance.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = label;
   email = {
     address0 = "noreply@${domain0}";
   };

modules/config/instances/config/jellyfin.nix

@@ -13,6 +13,7 @@ in
 {
   label = label;
   name = name;
+  short = "Jelly";
   sops = {
     path0 = "${sopsPath}/${name}";
   };
@@ -33,8 +34,8 @@ in
     path1 = "${servicePath}/${label}/cache";
   };
   ports = {
-    port0 = 5055; # Jellyseer
+    port0 = 8096; # Jellyfin HTTP
-    port1 = 8096; # Jellyfin HTTP
+    port1 = 5055; # Jellyseer
     port2 = 8920; # Jellyfin HTTPS
   };
   ssl = {

modules/config/instances/config/mastodon.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = "Mast";
   email = {
     address0 = "noreply@${domain3}";
   };

modules/config/instances/config/matrix.nix

@@ -11,6 +11,7 @@ in
 {
   label = label;
   name = name;
+  short = label;
   sops = {
     path0 = "${sopsPath}/${name}";
   };

modules/config/instances/config/nextcloud.nix

@@ -14,6 +14,7 @@ in
 {
   label = label;
   name = name;
+  short = "Next";
   email = {
     address0 = "noreply@${name}.${domain0}";
   };

modules/config/instances/config/ollama.nix

@@ -14,6 +14,7 @@ in
 {
   label = label;
   name = name;
+  short = label;
   sops = {
     path0 = "${sopsPath}/${name}";
   };

modules/config/instances/config/opencloud.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = "Cloud";
   email = {
     address0 = "noreply@${domain0}";
   };

modules/config/instances/config/owncast.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = "Cast";
   sops = {
     path0 = "${sopsPath}/${name}";
   };

modules/config/instances/config/peertube.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = "Peer";
   email = {
     address0 = "noreply@${domain3}";
   };

modules/config/instances/config/searx.nix

@@ -15,6 +15,7 @@ in
 {
   label = label;
   name = name;
+  short = "Sear";
   email = {
     address0 = "noreply@${domain0}";
   };

modules/config/instances/config/syncthing.nix

@@ -14,6 +14,7 @@ in
 {
   label = label;
   name = name;
+  short = "Sync";
   sops = {
     path0 = "${sopsPath}/${name}";
   };

modules/config/instances/config/synology.nix

@@ -11,6 +11,7 @@ in
 {
   label = label;
   name = name;
+  short = "Nas";
   tags = [
     name
     "dsm"

modules/config/instances/config/upRootNutrition.nix

@@ -12,6 +12,7 @@ in
 {
   label = label;
   name = name;
+  short = "upRoot";
   email = {
     address0 = "nick@${domain3}";
   };

modules/config/instances/config/vaultwarden.nix

@@ -14,6 +14,7 @@ in
 {
   label = label;
   name = name;
+  short = "Vault";
   email = {
     address0 = "noreply@${name}.${domain0}";
   };

modules/config/instances/config/web.nix

@@ -6,10 +6,12 @@ let
     domain2
     domain3
     ;
+  label = "Router";
 in
 {
+  label = label;
   name = "router";
-  label = "Router";
+  short = label;
   domains = {
     url0 = domain0;
     url1 = domain1;

modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix

@@ -1,11 +1,5 @@
 { flake, ... }:
 let
-  inherit (flake.config.people)
-    user0
-    ;
-  inherit (flake.config.people.users.${user0})
-    aliases
-    ;
   inherit (flake.config.machines.devices)
     synology
     ceres
@@ -15,11 +9,64 @@ let
     instances
     ;
 
-in
+  makeBookmarks =
-{
+    {
-  name = "Self Hosted";
+      suffix,
-  toolbar = false;
+      urlTemplate,
-  bookmarks = [
+      services,
+    }:
+    builtins.map (name: {
+      name = "${instances.${name}.label} ${suffix}";
+      url = urlTemplate name;
+      tags = instances.${name}.tags;
+      keyword = instances.${name}.short;
+    }) (builtins.map (service: instances.${service}.name) services);
+
+  bookmarkConfigs = [
+    {
+      suffix = "(Remote)";
+      urlTemplate = name: "https://${instances.${name}.domains.url0}";
+      services = [
+        "audiobookshelf"
+        "forgejo"
+        "glance"
+        "jellyfin"
+        "mastodon"
+        "ollama"
+        "opencloud"
+        "owncast"
+        "peertube"
+        "searx"
+        "vaultwarden"
+      ];
+    }
+    {
+      suffix = "(Desktop)";
+      urlTemplate = name: "http://${mars.ip.address0}:${toString instances.${name}.ports.port0}";
+      services = [
+        "ollama"
+        "syncthing"
+      ];
+    }
+    {
+      suffix = "(Server)";
+      urlTemplate = name: "http://${ceres.ip.address0}:${toString instances.${name}.ports.port0}";
+      services = [
+        "jellyfin"
+      ];
+    }
+    {
+      suffix = "(Synology)";
+      urlTemplate = name: "http://${synology.ip.address0}:${toString instances.${name}.ports.port0}";
+      services = [
+        "syncthing"
+      ];
+    }
+  ];
+
+  generatedBookmarks = builtins.concatLists (builtins.map makeBookmarks bookmarkConfigs);
+
+  flatBookmarks = [
     {
       name = "Elm-Land Server";
       url = "http://localhost:1234";
@@ -30,42 +77,6 @@ in
       ];
       keyword = "Website";
     }
-    {
-      name = instances.opencloud.label;
-      url = "https://${instances.opencloud.domains.url0}";
-      tags = [
-
-      ];
-      keyword = "Cloud";
-    }
-    {
-      name = instances.forgejo.label;
-      url = "https://${instances.forgejo.domains.url0}";
-      tags = [
-
-      ];
-      keyword = instances.forgejo.label;
-    }
-    {
-      name = "${instances.jellyfin.label} (Internet)";
-      url = "https://${instances.jellyfin.domains.url0}";
-      tags = [ ];
-      keyword = instances.jellyfin.label;
-    }
-    {
-      name = "${instances.jellyfin.label} (Local)";
-      url = "http://${ceres.ip.address0}:${toString instances.jellyfin.ports.port1}";
-      tags = [ ];
-      keyword = instances.jellyfin.label;
-    }
-    {
-      name = instances.mastodon.label;
-      url = "https://${instances.mastodon.domains.url0}";
-      tags = [
-
-      ];
-      keyword = instances.mastodon.label;
-    }
     {
       name = "Namecheap";
       url = "https://www.namecheap.com";
@@ -77,78 +88,16 @@ in
       ];
       keyword = "Name";
     }
-    {
-      name = instances.nextcloud.label;
-      url = "https://${instances.nextcloud.domains.url0}";
-      tags = [
-
-      ];
-      keyword = instances.nextcloud.label;
-    }
-    {
-      name = "${instances.glance.label} (Local)";
-      url = "https://${instances.glance.domains.url0}";
-      tags = [
-
-      ];
-      keyword = instances.glance.label;
-    }
-    {
-      name = "${instances.ollama.label} (Server)";
-      url = "https://${instances.ollama.domains.url0}";
-      tags = [ ];
-      keyword = instances.ollama.label;
-    }
-    {
-      name = "${instances.ollama.label} (Desktop)";
-      url = "http://${mars.ip.address0}:${toString instances.ollama.ports.port0}";
-      tags = [ ];
-      keyword = instances.ollama.label;
-    }
     {
       name = "Router";
       url = "http://${instances.web.localhost.address2}";
-      tags = [
+      tags = [ ];
-      ];
       keyword = "Router";
     }
-    {
-      name = "${instances.searx.label} (Internet)";
-      url = "https://${instances.searx.domains.url0}";
-      tags = [
-
-      ];
-      keyword = instances.searx.label;
-    }
-    {
-      name = "${instances.syncthing.label} (${instances.synology.label})";
-      url = "http://${synology.ip.address0}:${toString instances.syncthing.ports.port0}";
-      tags = [
-      ];
-      keyword = instances.syncthing.label;
-    }
-    {
-      name = "${instances.syncthing.label} (Desktop)";
-      url = "http://localhost:${toString instances.syncthing.ports.port0}";
-      tags = [
-      ];
-      keyword = instances.syncthing.label;
-    }
-    {
-      name = instances.synology.label;
-      url = "https://${synology.ip.address0}:${toString instances.synology.ports.port0}";
-      tags = [
-
-      ];
-      keyword = instances.synology.label;
-    }
-    {
-      name = instances.vaultwarden.label;
-      url = "https://${instances.vaultwarden.domains.url0}";
-      tags = [
-
-      ];
-      keyword = instances.vaultwarden.label;
-    }
   ];
+in
+{
+  name = "Self Hosted";
+  toolbar = false;
+  bookmarks = flatBookmarks ++ generatedBookmarks;
 }

modules/nixos/services/jellyfin/default.nix

@@ -25,7 +25,7 @@ in
             redir /.well-known/carddav /remote.php/dav/ 301
             redir /.well-known/caldav /remote.php/dav/ 301
 
-            reverse_proxy ${localhost}:${toString service.ports.port1}
+            reverse_proxy ${localhost}:${toString service.ports.port0}
 
             tls ${service.ssl.cert} ${service.ssl.key}
           '';