From cc1ab841c203ada6942ef10ca57035cf6b4a3507 Mon Sep 17 00:00:00 2001
From: Kaare Hoff Skovgaard <kaare@kaareskovgaard.net>
Date: Wed, 30 Jul 2025 17:25:02 +0200
Subject: [PATCH] Add basic support for managesieve (+ roundcube support)

---
 nix/modules/nixos/infrastructure/mailserver/default.nix  | 1 +
 .../nixos/infrastructure/mailserver/managesieve.nix      | 9 +++++++++
 .../aarch64-linux/mx.kaareskovgaard.net/default.nix      | 3 +++
 3 files changed, 13 insertions(+)
 create mode 100644 nix/modules/nixos/infrastructure/mailserver/managesieve.nix

diff --git a/nix/modules/nixos/infrastructure/mailserver/default.nix b/nix/modules/nixos/infrastructure/mailserver/default.nix
index f59e4e1..c3a3aa9 100644
--- a/nix/modules/nixos/infrastructure/mailserver/default.nix
+++ b/nix/modules/nixos/infrastructure/mailserver/default.nix
@@ -22,6 +22,7 @@ in
     ./dmarc.nix
     ./dane.nix
     ./dkim.nix
+    ./managesieve.nix
     ./mta-sts.nix
     ./spf.nix
     ./tls-rpt.nix
diff --git a/nix/modules/nixos/infrastructure/mailserver/managesieve.nix b/nix/modules/nixos/infrastructure/mailserver/managesieve.nix
new file mode 100644
index 0000000..982cfbd
--- /dev/null
+++ b/nix/modules/nixos/infrastructure/mailserver/managesieve.nix
@@ -0,0 +1,9 @@
+{ config, lib, ... }:
+let
+  cfg = config.khscodes.infrastructure.mailserver;
+in
+{
+  config = lib.mkIf cfg.enable {
+    services.dovecot2.protocols = [ "sieve" ];
+  };
+}
diff --git a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix
index 737fa57..5e9e54a 100644
--- a/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix
+++ b/nix/systems/aarch64-linux/mx.kaareskovgaard.net/default.nix
@@ -74,6 +74,9 @@
       $config['oauth_identity_uri'] = 'https://login.kaareskovgaard.net/oauth2/openid/dovecot/userinfo';
       $config['oauth_identity_fields'] = ['preferred_username'];
       $config['oauth_scope'] = 'email openid profile';
+      $config['plugins'] = [
+        'managesieve',
+      ];
     '';
   };
   khscodes.services.nginx = {