From ac97d672414339ee6a27056c17a1fe89c1059a3f Mon Sep 17 00:00:00 2001
From: RGBCube <git@rgbcu.be>
Date: Wed, 17 Jan 2024 12:58:25 +0300
Subject: [PATCH] Fix mail server maybe???

---
 hosts/cube/mail.nix | 19 +++++++++++++++++--
 secrets/secrets.nix |  6 +++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/hosts/cube/mail.nix b/hosts/cube/mail.nix
index 5d52df7..de09862 100644
--- a/hosts/cube/mail.nix
+++ b/hosts/cube/mail.nix
@@ -37,22 +37,37 @@ in serverSystemConfiguration {
   services.kresd.listenPlain         = lib.mkForce [ "[::]:53" "0.0.0.0:53" ];
   services.redis.servers.rspamd.bind = "0.0.0.0";
 
+  services.dovecot2.sieve = {
+    extensions       = [ "fileinto" ];
+    globalExtensions = [ "+vnd.dovecot.pipe" "+vnd.dovecot.environment" ];
+    plugins          = [ "sieve_imapsieve" "sieve_extprograms" ];
+  };
+
   mailserver = enabled {
     inherit fqdn;
 
-    domains = [ domain ];
-
+    domains           = [ domain ];
     certificateScheme = "acme";
 
     hierarchySeparator = "/";
     useFsLayout        = true;
 
+    mailDirectory  = "/var/lib/mail";
+    sieveDirectory = "/var/lib/sieve";
+
+    vmailUserName  = "mail";
+    vmailGroupName = "mail";
+
     dmarcReporting = enabled {
       inherit domain;
 
       organizationName = "Doofemshmirtz Evil Inc.";
     };
 
+    fullTextSearch = enabled {
+      indexAttachments = true;
+    };
+
     loginAccounts."contact@${domain}" = {
       aliases = [ "@${domain}" ];
 
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 6ee1cc8..80dddd1 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -9,15 +9,15 @@ let
 in {
   inherit keys;
 
-  "cube/id.age".publicKeys = normal keys.rgbcube;
+  "cube/id.age".publicKeys = server keys.cube;
 
   "cube/password.hash.mail.age".publicKeys = server keys.cube;
   "cube/password.hash.rgb.age".publicKeys  = server keys.cube;
 
   "cube/password.acme.age".publicKeys = server keys.cube;
 
-  "cube/password.grafana.age".publicKeys   = server keys.cube;
-  "cube/password.mail.grafana.age".publicKeys   = server keys.cube;
+  "cube/password.grafana.age".publicKeys      = server keys.cube;
+  "cube/password.mail.grafana.age".publicKeys = server keys.cube;
 
   "cube/password.nextcloud.age".publicKeys = server keys.cube;