3 files changed, 11 insertions, 23 deletions
diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index 4836702..db2f6c2 100644
--- a/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -5,7 +5,6 @@
     ./nvidia.nix
     ./backup.nix
     ./firewall.nix
-    ../../services/mail2.nix
   ];
 
   ## TODO REMOVE LATER TO PREVENT ELI FROM BUILDING REMOTELY
@@ -20,16 +19,6 @@
     HandleLidSwitchDocked = "ignore";
   };
 
-  wilkuu.services.test_endpoint.enable = false;
-  wilkuu.services.mail = {
-    enable = true;
-    doACME = false;
-    defaultDomain = "apocalypse.local";
-    domains = [ "apocalypse.local" ];
-    wellKnownDomains = [ ];
-    startupMode = "bootstrap";
-  };
-
   ## Addons for this system
   addons = {
     desktop.hyprland.enable = false;
diff --git a/hosts/omega-relay/default.nix b/hosts/omega-relay/default.nix
index 32ba860..8901ca4 100644
--- a/hosts/omega-relay/default.nix
+++ b/hosts/omega-relay/default.nix
@@ -11,13 +11,13 @@
     ./vm.nix
     ./hardware-configuration.nix
     ../../services/mysql.nix
-    ../../services/email.nix
     ../../services/vaultwarden.nix
     ../../services/uptimekuma.nix
     ../../services/freshrss.nix
     ../../services/wakapi.nix
     ../../services/continuwuity.nix
     ../../services/bulwark.nix
+    ../../services/mail2.nix
   ];
 
   addons = {
@@ -28,6 +28,7 @@
     gpg.enable = true;
     virtualisation.guest = true;
   };
+  nix.settings.trusted-users = [ "wilkuu"];
   boot.loader.grub = {
     enable = true;
     efiSupport = false;
@@ -49,24 +50,22 @@
         doACME = !isVM;
         port = 8080;
       };
-
-      stalwart = {
+      
+      mail = {
         enable = true;
-        domain = if isVM then "mail.omega-relay.local" else "mail.wilkuu.xyz";
+        startupMode = "recovery"; 
+        defaultDomain = if isVM then "mail.omega-relay.local" else "mail.wilkuu.xyz";
         wellKnownDomains = [
           "wilkuu.xyz"
           "wilkuu.nl"
         ];
-        additionalDomains = [ "mail.wilkuu.nl" ];
+        domains = [ "wilkuu.xyz" "wilkuu.nl" ];
         doACME = !isVM;
-        corsDomains = [
-          "qtab.wilkuu.nl"
-          "qtab-dev.wilkuu.nl"
-          "bulwark.wilkuu.nl"
-          "bulwark.wilkuu.xyz"
-        ];
+        extraConfig = []; 
+        extraCreate = [];  
       };
 
+  
       bulwark = {
         enable = true;
         jmap_servers = [ "mail.wilkuu.xyz" ];
diff --git a/hosts/tacitus/default.nix b/hosts/tacitus/default.nix
index 1efc539..38de6d0 100644
--- a/hosts/tacitus/default.nix
+++ b/hosts/tacitus/default.nix
@@ -13,7 +13,7 @@
     gpg.enable = true;
     virtualisation.host = true;
   };
-
+  nix.settings.trusted-users = [ "wilkuu"];
   # Bootloader and boot setup.
   boot.loader.efi.canTouchEfiVariables = lib.mkDefault true;
   boot.loader.limine = {