From ad57da6bda1cb00ab11f78125c16daebbf0c221c Mon Sep 17 00:00:00 2001
From: Jakub Stachurski <j.stachurski@student.utwente.nl>
Date: Thu, 30 Apr 2026 13:20:44 +0200
Subject: Fix toml generation for stalwart

---
 services/email.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/services/email.nix b/services/email.nix
index c2bd588..c698c5c 100644
--- a/services/email.nix
+++ b/services/email.nix
@@ -235,16 +235,12 @@ in
 
           certificate = (
             lib.mkIf (cfg.doACME) (
-              lib.genAttrs (map (d: "nix_${d}") ([ cfg.domain ] ++ cfg.additionalDomains)) (
-                _name:
-                let
-                  domain = lib.strings.removePrefix "nix_" _name;
-                in
-                {
+              lib.mapAttrs' (name: value: ( lib.nameValuePair ("nix_${(lib.replaceString "." "_" name)}") (value) )) (
+                lib.genAttrs ([ cfg.domain ] ++ cfg.additionalDomains) (domain: {
                   cert = toStalwartCred "tls_${domain}_cert.pem";
                   private-key = toStalwartCred "tls_${domain}_key.pem";
                   default = (domain == cfg.domain);
-                }
+                })
               )
             )
           );
-- 
cgit v1.3.1