feat(refactor): ready for merge

lib/server/default.nix

@@ -1,5 +1,26 @@
-{
-  imports = [
-    ./serviceurl
-  ];
+{lib}: let
+  server = {
+    mkDomain = config: service: let
+      localDomain = config.settings.accounts.domains.local;
+      publicDomain = config.settings.accounts.domains.public;
+      tailscaleDomain = "ts.${publicDomain}";
+    in
+      if service.exposure == "tunnel"
+      then publicDomain
+      else if service.exposure == "tailscale"
+      then tailscaleDomain
+      else localDomain;
+
+    mkFullDomain = config: service: let
+      domain = server.mkDomain config service;
+    in "${service.subdomain}.${domain}";
+
+    mkHostDomain = config: service: let
+      domain = server.mkDomain config service;
+    in "${domain}";
+
+    mkSubDomain = config: service: "${service.subdomain}";
+  };
+in {
+  server = server;
 }

lib/server/serviceurl/default.nix

@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  mkServiceUrl' = import ./serviceurl.nix {inherit config;};
-in {
-  options.clib = {
-    server = {
-      mkServiceUrl = lib.mkOption {
-        type = lib.types.function;
-        readOnly = true;
-        description = "Helper function to generate a service URL.";
-      };
-    };
-  };
-
-  config.clib = {
-    server = {
-      mkServiceUrl = mkServiceUrl';
-    };
-  };
-}

lib/server/serviceurl/serviceurl.nix

@@ -1,11 +0,0 @@
-{config}: service: let
-  mainDomain = config.server.networking.domain;
-  tailscaleDomain = "ts.${mainDomain}";
-
-  domain =
-    if service.exposure == "tunnel"
-    then mainDomain
-    else if service.exposure == "tailscale"
-    then tailscaleDomain
-    else (service.domain or mainDomain);
-in "${service.subdomain}.${domain}"