From 0a817c26eebc9a3259582c1e8edd16302a018bfa Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Sat, 23 Nov 2024 20:47:35 -0600
Subject: [PATCH] feat: server test

---
 nixos/modules/services/acme.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/acme.nix b/nixos/modules/services/acme.nix
index 70a7150..cd14ac8 100755
--- a/nixos/modules/services/acme.nix
+++ b/nixos/modules/services/acme.nix
@@ -5,13 +5,10 @@
 }: let
   inherit (flake.config.people.users.user0) email;
   inherit (flake.config.services) instances;
-
   domain0 = instances.web.domains.url0;
   domain1 = instances.web.domains.url1;
   dns = instances.web.dns.provider0;
-
   instanceName = service: (instances.${service}.subdomain);
-
   dnsConfig = {
     dnsProvider = dns;
     directory = instances.acme.paths.path0;
@@ -25,12 +22,11 @@ in {
       server = "https://acme-v02.api.letsencrypt.org/directory";
     };
     certs = builtins.listToAttrs (
-      (map (prefix: {
-          name = "${prefix}.${domain0}";
+      (map (service: {
+          name = "${instanceName service}.${domain0}";
           value = dnsConfig;
         })
-        map
-        instanceName [
+        [
           "nextcloud"
           "jellyfin"
           "minecraft"
@@ -38,12 +34,11 @@ in {
           "syncthing"
           "vaultwarden"
         ])
-      ++ (map (prefix: {
-          name = "${prefix}.${domain1}";
+      ++ (map (service: {
+          name = "${instanceName service}.${domain1}";
           value = dnsConfig;
         })
-        map
-        instanceName [
+        [
           "wiki"
           "nextcloud"
           "castopod"
@@ -63,7 +58,6 @@ in {
         ])
     );
   };
-
   sops = let
     sopsSecrets = ["pass"];
     sopsPath = secret: {