From e435b7e1342486bac8b133f230576d7539cb691c Mon Sep 17 00:00:00 2001
From: Jakub Stachurski <jakub@wilkuu.xyz>
Date: Sun, 7 Jun 2026 20:13:51 +0200
Subject: mail(omega): Finalize config for mail

---
 flake.nix                      | 1 +
 hosts/omega-relay/default.nix  | 4 ++--
 hosts/omega-relay/firewall.nix | 1 +
 services/mail2.nix             | 5 ++++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3d9f7ac..0c60b1f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -127,6 +127,7 @@
             ./hosts/omega-relay
             home-manager.nixosModules.default
             disko.nixosModules.disko
+            stalwart-nix.nixosModules.default
             sops-nix.nixosModules.default
           ];
 
diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index 8901ca4..ba92775 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -53,8 +53,8 @@
       
       mail = {
         enable = true;
-        startupMode = "recovery"; 
-        defaultDomain = if isVM then "mail.omega-relay.local" else "mail.wilkuu.xyz";
+        startupMode = "normal"; 
+        defaultDomain = "mail.wilkuu.xyz";
         wellKnownDomains = [
           "wilkuu.xyz"
           "wilkuu.nl"
diff --git a/hosts/omega-relay/firewall.nix b/hosts/omega-relay/firewall.nix
index 086a86e..38cd9a1 100644
--- a/hosts/omega-relay/firewall.nix
+++ b/hosts/omega-relay/firewall.nix
@@ -10,6 +10,7 @@ let
     443
     993
     465
+    587
   ];
   baseUDP = [
     wgHomePort # Wireguard
diff --git a/services/mail2.nix b/services/mail2.nix
index e2f041a..b4551cf 100644
--- a/services/mail2.nix
+++ b/services/mail2.nix
@@ -113,7 +113,10 @@ in
           '';
         };
       };
-
+      
+      security.acme.certs.${cfg.defaultDomain}.extraLegoRenewFlags = [
+        "--reuse-key"
+      ];
       services.nginx.enable = lib.mkDefault true;
       services.nginx.virtualHosts =
         (lib.genAttrs
-- 
cgit v1.3.1