From 4e5c7f7fe88b253a0682fcda9f9d020f13d5a07b Mon Sep 17 00:00:00 2001
From: Lyes Saadi <dev@lyes.eu>
Date: Wed, 15 Oct 2025 14:34:26 +0200
Subject: [PATCH] Adding hidden sieve config

---
 modules/server/taf/default.nix  |  20 +++++++++++++++-----
 secrets.nix                     |   1 +
 secrets/lyes/hidden-sieve.age   | Bin 0 -> 536 bytes
 users/lyes/desktop/packages.nix |   3 ---
 4 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 secrets/lyes/hidden-sieve.age

diff --git a/modules/server/taf/default.nix b/modules/server/taf/default.nix
index 6427b41..d7395f1 100644
--- a/modules/server/taf/default.nix
+++ b/modules/server/taf/default.nix
@@ -48,22 +48,24 @@
         ];
         quota = "1T";
         sieveScript = ''
-          require ["fileinto", "regex", "variables"];
+          require ["include", "fileinto", "mailbox", "copy", "regex", "variables"];
+
+          include :personal "hiddensieve";
 
           if address :is :domain "X-Original-To" "lyes.eu" {
             if address :localpart :regex "X-Original-To" "^(([a-zA-Z]+\\.)*([a-zA-Z]+))(-([a-zA-Z0-9_.\\-]*))?''$" {
               set "mbox_candidate" "INBOX.''${1}";
-              fileinto "''${mbox_candidate}";
+              fileinto :create "''${mbox_candidate}";
             }
             else {
-              fileinto "INBOX.other";
+              fileinto :create "INBOX.other";
             }
           }
           elsif address :is "X-Original-To" "lyes@mail.lyes.eu" {
-            fileinto "INBOX";
+            fileinto :create "INBOX";
           }
           else {
-            fileinto "INBOX.other";
+            fileinto :create "INBOX.other";
           }
         '';
       };
@@ -115,5 +117,13 @@
       owner = "postfix";
       file = ../../../secrets/lyes/mail-passwd.age;
     };
+
+    lyes-hidden-sieve = {
+      file = ../../../secrets/lyes/hidden-sieve.age;
+      path = "/var/sieve/lyes@mail.lyes.eu/scripts/hiddensieve.sieve";
+      owner = "virtualMail";
+      group = "virtualMail";
+      mode = "660";
+    };
   };
 }
diff --git a/secrets.nix b/secrets.nix
index 0cb5945..6b8f51f 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -8,6 +8,7 @@ in
 {
   # Lyes
   "secrets/lyes/mail-passwd.age".publicKeys = [ lyes zora ];
+  "secrets/lyes/hidden-sieve.age".publicKeys = [ lyes zora ];
 
   # Zora
   "secrets/zora/services/kanidm-admin-password.age".publicKeys = all;
diff --git a/secrets/lyes/hidden-sieve.age b/secrets/lyes/hidden-sieve.age
new file mode 100644
index 0000000000000000000000000000000000000000..c5169133a44d17f30d0d5106d82c08a5a116dbec
GIT binary patch
literal 536
zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCSH&nOKl2vjK0_DeVO
z%gxIxHZM=Kuq-n0w@3>L$S+C?ND3`6bk5KZ^s1<=%<xUG@Z>5Cif}XbEl3Iqaji1S
z^f0Wn^bGfRbuxA_*3Ppmb98k{^9WA%@y{xEj6}CB#H}#hGhM+TB-ytz(bGJu!YDT<
zUpq3Quson7H{03WB0saxu*AbLF}={krNp(g(t^t=D$v7OKRGib+_*5aI5*NVE#Ir8
zs5r?y(=o}wC#}HE$GO1M%O@|$&5=u2S63m((Z$I>BiJd|JHx=hv)C*z)vGMr*E!h4
z!Y8WKJ0PGas~{({(l6i0$CK;FGTB`#HCOISpCj?cPw|Jh{O6RpJH93TUdXv3P(JD9
zvle09^53T-%p~2~?7UhPD~xWhy~VRw-_`l!(i0Z~M9RDlJ=l7*TFOb$=)v4MQ;ZfX
z`#oBJI(19Lal_*|a<anlDQA1xyjQbLyR+?A{)A18b|xi{k1X2$cRG95vY*$E`D|Ih
z+I712;9?)%+28iu+E-R{hhIKH@UxW{Lzr2w(@MLSHM0vv@7TFX*K?F+y#K!CuvE=8
z;r^+~?7VKe5tq+i+j8+t{XUJR)7=dLyX2-U*K02>S;&7pbJqPjCeQkp?cGnf7=;{u
X-Oh1azxUn8)t|d-XI*msTe}nh0_WNB

literal 0
HcmV?d00001

diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix
index 4c4c17e..69ed2c4 100644
--- a/users/lyes/desktop/packages.nix
+++ b/users/lyes/desktop/packages.nix
@@ -138,10 +138,7 @@ in {
     via
 
     # Proton
-    protonmail-bridge-gui
-    protonmail-desktop
     protonvpn-gui
-    proton-pass
 
     # Multimedia
     pipewire.dev