1 files changed, 6 insertions, 3 deletions

diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix
index 51f4de7..2af1849 100644
--- a/modules/private/mail/postfix.nix
+++ b/modules/private/mail/postfix.nix
@@ -267,9 +267,12 @@
           );
         };
         sasl_access = {
-          host_sender_login = pkgs.writeText "host-sender-login"
-            (builtins.concatStringsSep "\n" (lib.flatten (lib.attrsets.mapAttrsToList
-            (n: v: (map (e: "${e}  ${n}@immae.eu") v.emails)) config.myEnv.servers)));
+          host_sender_login = with lib.attrsets; let
+            addresses = zipAttrs (lib.flatten (mapAttrsToList
+              (n: v: (map (e: { "${e}" = "${n}@immae.eu"; }) v.emails)) config.myEnv.servers));
+            joined = builtins.concatStringsSep ",";
+          in pkgs.writeText "host-sender-login"
+            (builtins.concatStringsSep "\n" (mapAttrsToList (n: v: "${n} ${joined v}") addresses));
           host_dummy_mailboxes = pkgs.writeText "host-virtual-mailbox"
             (builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v: "${n}@immae.eu  dummy") nodes));
         };