feat: updated abstractions

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

@@ -3,46 +3,63 @@ let
   inherit (flake.config.machines.devices) mars;
   inherit (flake.config.services) instances;
 
+  svc = service: interface: { inherit service interface; };
+
   makeBookmarks =
     {
       suffix,
       urlTemplate,
       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);
+    builtins.map (
+      { service, interface }:
+      let
+        name = instances.${service}.name;
+        interfaceData = instances.${name}.interfaces.${interface};
+      in
+      {
+        name = "${instances.${name}.label} ${suffix}";
+        url = urlTemplate name interfaceData;
+        tags = instances.${name}.tags;
+        keyword = instances.${name}.short;
+      }
+    ) services;
 
-  instanceList = [
-    instances.firefly-iii.name
-    instances.forgejo.name
-    instances.jellyfin.name
-    instances.mastodon.name
-    instances.ollama.name
-    instances.qbittorrent.name
-    instances.vaultwarden.name
-  ];
   bookmarkConfigs = [
     {
       suffix = "(Remote)";
-      urlTemplate = name: "https://${instances.${name}.domains.url0}";
-      services = instanceList;
+      urlTemplate = name: iface: "https://${iface.domain}";
+      services = [
+        (svc instances.firefly-iii.name "interface0")
+        (svc instances.forgejo.name "interface0")
+        (svc instances.jellyfin.name "interface0")
+        (svc instances.mastodon.name "interface0")
+        (svc instances.ollama.name "interface0")
+        (svc instances.qbittorrent.name "interface0")
+        (svc instances.vaultwarden.name "interface0")
+      ];
     }
     {
       suffix = "(Server)";
       urlTemplate =
-        name: "http://${instances.${name}.interface.ip}:${builtins.toString instances.${name}.ports.port0}";
-      services = instanceList;
+        name: iface: "http://${iface.microvm.ip}:${builtins.toString instances.${name}.ports.port0}";
+      services = [
+        (svc instances.firefly-iii.name "interface0")
+        (svc instances.forgejo.name "interface0")
+        (svc instances.jellyfin.name "interface0")
+        (svc instances.mastodon.name "interface0")
+        (svc instances.ollama.name "interface0")
+        (svc instances.qbittorrent.name "interface0")
+        (svc instances.vaultwarden.name "interface0")
+      ];
     }
     {
       suffix = "(Desktop)";
-      urlTemplate = name: "http://${mars.ip.address0}:${builtins.toString instances.${name}.ports.port0}";
+      urlTemplate =
+        name: iface: "http://${mars.ip.address0}:${builtins.toString instances.${name}.ports.port0}";
       services = [
-        instances.ollama.name
-        instances.syncthing.name
+        (svc instances.ollama.name "interface0")
+        (svc instances.syncthing.name "interface0")
       ];
     }
   ];
@@ -52,7 +69,7 @@ let
   flatBookmarks = [
     {
       name = instances.web.label;
-      url = "http://${instances.web.localhost.address2}";
+      url = "http://${instances.web.addresses.address2}";
       tags = instances.web.tags;
       keyword = instances.web.label;
     }

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

@@ -1,9 +1,6 @@
-{ flake, osConfig, ... }:
+{ flake, ... }:
 let
   inherit (flake.config.services) instances;
-  inherit (flake.config.machines) devices;
-  localhost = instances.web.localhost.address0;
-  hostname = osConfig.networking.hostName;
 in
 {
   "${instances.jellyfin.label}" = {
@@ -13,26 +10,26 @@ in
     icon = ./icons/jf.png;
     urls = [
       {
-        template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}";
-      }
-    ];
-  };
-  "${instances.searx.label}" = {
-    definedAliases = [
-      "@sx"
-    ];
-    icon = ./icons/sx.png;
-    urls = [
-      {
-        template =
-          (
-            if hostname == devices.mars.name then
-              "http://${localhost}:${toString instances.searx.ports.port0}"
-            else
-              "https://${instances.searx.subdomain}.${instances.web.domains.url0}"
-          )
-          + "/search?q={searchTerms}";
+        template = "https://${instances.jellyfin.interfaces.interface0.domain}/web/#/search.html?query={searchTerms}";
       }
     ];
   };
+  # "${instances.searx.label}" = {
+  #   definedAliases = [
+  #     "@sx"
+  #   ];
+  #   icon = ./icons/sx.png;
+  #   urls = [
+  #     {
+  #       template =
+  #         (
+  #           if hostname == devices.mars.name then
+  #             "http://${localhost}:${toString instances.searx.ports.port0}"
+  #           else
+  #             "https://${instances.searx.subdomain}.${instances.web.domains.url0}"
+  #         )
+  #         + "/search?q={searchTerms}";
+  #     }
+  #   ];
+  # };
 }

modules/home/gui/apps/code/zed/config/userSettings/config/assistant/default.nix

@@ -8,7 +8,7 @@ let
     web
     ;
   service = ollama;
-  localhost = web.localhost.address0;
+  localhost = web.addresses.address0;
 in
 {
   agent = {

modules/home/gui/apps/tools/espanso/config/url.nix

@@ -1,10 +1,10 @@
 { flake, matchHelper, ... }:
 let
-  inherit (flake.config.services.instances) forgejo mastodon web;
+  inherit (flake.config.services) instances;
 in
 [
   (matchHelper ":dotfiles" "https://gitlab.com/upRootNutrition/dotfiles")
-  (matchHelper ":website" "https://${web.domains.url1}")
-  (matchHelper ":forgejo" "https://${forgejo.domains.url0}")
-  (matchHelper ":mastodon" "https://${mastodon.domains.url0}")
+  (matchHelper ":website" "https://${instances.jellyfin.interfaces.interface0.domain}")
+  (matchHelper ":forgejo" "https://${instances.forgejo.interfaces.interface0.domain}")
+  (matchHelper ":mastodon" "https://${instances.mastodon.interfaces.interface0.domain}")
 ]

modules/nixos/homelab/samba/default.nix

@@ -8,19 +8,4 @@ let
 in
 {
   imports = importList;
-
-  services = {
-    samba = {
-      enable = true;
-    };
-  };
-
-  networking = {
-    firewall = {
-      allowedTCPPorts = [
-        445
-      ];
-    };
-  };
-
 }

modules/nixos/homelab/samba/sambaCeres/default.nix

@@ -12,6 +12,7 @@ in
   # sudo smbpasswd -a username
   services = {
     samba = {
+      enable = true;
       # package = pkgs.samba4Full;
       openFirewall = true;
       settings = {

modules/nixos/homelab/samba/sambaEris/default.nix

@@ -10,6 +10,7 @@ in
   # sudo smbpasswd -a username
   services = {
     samba = {
+      enable = true;
       openFirewall = true;
       settings = {
         "storage" = {