From 36ab46439ac289bb233d1fd0499d5ce6db2ffa34 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Tue, 30 Jan 2024 23:01:09 +0700
Subject: [PATCH] server: fix mailserver

---
 flake.lock                         | 7 +++----
 flake.nix                          | 2 +-
 system/hosts/server/mailserver.nix | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2e0872c..7a72ce2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -302,16 +302,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706397479,
-        "narHash": "sha256-f5aOlL5eKiOkQy89sOvN653Yue1r/aXWTCL/Kz1iRMc=",
+        "lastModified": 1706628962,
+        "narHash": "sha256-BBbgY5OsYMxithcHtoulfAJHTmNxQ41Gr99cHZo4yOM=",
         "owner": "chayleaf",
         "repo": "nixpkgs",
-        "rev": "74ece655ded61dc9cb4a718cb574a73bb34a68bf",
+        "rev": "8a98311cb973d73718e004461d57635b23f632af",
         "type": "github"
       },
       "original": {
         "owner": "chayleaf",
-        "ref": "ci",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index abe1a46..a0072d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     #nixpkgs.url = "github:NixOS/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f";
     # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:chayleaf/nixpkgs/ci";
+    nixpkgs.url = "github:chayleaf/nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
diff --git a/system/hosts/server/mailserver.nix b/system/hosts/server/mailserver.nix
index 2916767..2f10e0a 100644
--- a/system/hosts/server/mailserver.nix
+++ b/system/hosts/server/mailserver.nix
@@ -46,6 +46,8 @@ in {
     hashedPassword = cfg.hashedNoreplyPassword;
     sendOnly = true;
   };
+  # TODO: remove when https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/275 is fixed
+  services.dovecot2.sieve.extensions = [ "fileinto" ];
   services.dovecot2.extraConfig =
     let
       passwd = builtins.toFile "dovecot2-local-passwd" ''