diff --git a/flake.lock b/flake.lock
index 44b819b..d328898 100644
--- a/flake.lock
+++ b/flake.lock
@@ -173,11 +173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760312644,
-        "narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=",
+        "lastModified": 1760462439,
+        "narHash": "sha256-bks3rTsKGlqehk4l7rViIg2lBnUsY6we22O+ecRZB/c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e121f3773fa596ecaba5b22e518936a632d72a90",
+        "rev": "990e5ce6791ff1f497a61280a82eb66e3789e0e9",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1760380505,
-        "narHash": "sha256-qSDhqXzeGcgidKdT3HCxEbuo4/VFI46lcXODRZtwCxg=",
+        "lastModified": 1760466542,
+        "narHash": "sha256-q2QZhrrjHbvW4eFzoEGkj/wUHNU6bVGPyflurx5ka6U=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "21d967b539f2c599786356c2cae17b1273aaa6ad",
+        "rev": "3446bcbf5f46ecb18e82244888730c4983c30b22",
         "type": "github"
       },
       "original": {
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 011e5ae..beb326e 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -1,6 +1,10 @@
 { pkgs, ... }:
 
 {
+  imports = [
+    ./nullmailer.nix
+  ];
+
   services.openssh.enable = true;
 
   boot.swraid = {
diff --git a/modules/server/nullmailer.nix b/modules/server/nullmailer.nix
new file mode 100644
index 0000000..15f68e7
--- /dev/null
+++ b/modules/server/nullmailer.nix
@@ -0,0 +1,17 @@
+{ ... }:
+
+{
+  services.nullmailer = {
+    enable = true;
+
+    setSendmail = true;
+    config = {
+      remotes = ''
+        taf.lyes.eu smtp
+      '';
+      adminaddr = "root@lyes.eu";
+      defaulthost = "lyes.eu";
+      allmailfrom = "root@lyes.eu";
+    };
+  };
+}
diff --git a/modules/server/taf/default.nix b/modules/server/taf/default.nix
index 00a8276..6427b41 100644
--- a/modules/server/taf/default.nix
+++ b/modules/server/taf/default.nix
@@ -46,6 +46,26 @@
         aliases = [
           "@lyes.eu"
         ];
+        quota = "1T";
+        sieveScript = ''
+          require ["fileinto", "regex", "variables"];
+
+          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}";
+            }
+            else {
+              fileinto "INBOX.other";
+            }
+          }
+          elsif address :is "X-Original-To" "lyes@mail.lyes.eu" {
+            fileinto "INBOX";
+          }
+          else {
+            fileinto "INBOX.other";
+          }
+        '';
       };
     };
 
diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix
index e738a78..4c4c17e 100644
--- a/users/lyes/desktop/packages.nix
+++ b/users/lyes/desktop/packages.nix
@@ -72,7 +72,7 @@ in {
     # unstable.suyu
     # suyu
     # factorio
-    sgt-sgt-puzzles
+    sgt-puzzles
 
     # Reading
     # calibre