From 636da1a3431445e3947080bca106bfcfe8d0ca2f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 17 Jan 2026 00:00:58 -0500
Subject: [PATCH] [flake] update and remove stalwart override

---
 flake.lock                | 82 ++++++++++++++++-----------------------
 flake.nix                 |  1 -
 hosts/prefect/default.nix |  4 --
 3 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9b9986e4..43ab80e4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1767967164,
-        "narHash": "sha256-Cx4VETh9dGoQYDtWhre7g66d7SAr+h1h6f+SSHxVrck=",
+        "lastModified": 1768575137,
+        "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "e973584280e3b0e1d5b5a1a5e9948dc222c54af7",
+        "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611",
         "type": "github"
       },
       "original": {
@@ -310,11 +310,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1768397375,
-        "narHash": "sha256-7QqbFi3ERvKjEdAzEYPv7iSGwpUKSrQW5wPLMFq45AQ=",
+        "lastModified": 1768584846,
+        "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "efe2094529d69a3f54892771b6be8ee4a0ebef0f",
+        "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
         "type": "github"
       },
       "original": {
@@ -355,11 +355,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768403989,
-        "narHash": "sha256-kyQ79xcrgdnP2Pl7IzPUDo9Rotb4FdmvUxSYy7GfsbY=",
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "df6eeded8516d70bd9ece2f0c6904d9df8f3c04b",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
       },
       "original": {
@@ -449,11 +449,11 @@
     },
     "mnw": {
       "locked": {
-        "lastModified": 1758834834,
-        "narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
+        "lastModified": 1767030222,
+        "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=",
         "owner": "Gerg-L",
         "repo": "mnw",
-        "rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
+        "rev": "75bb637454b0fbbb5ed652375a4bf7ffd28bcf6f",
         "type": "github"
       },
       "original": {
@@ -490,15 +490,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1765720983,
-        "narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
+        "lastModified": 1768214250,
+        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
+        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
         "type": "github"
       },
       "original": {
         "owner": "feel-co",
+        "ref": "refs/tags/v2.6.0",
         "repo": "ndg",
         "type": "github"
       }
@@ -525,11 +526,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1767116409,
-        "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=",
+        "lastModified": 1768305791,
+        "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cad22e7d996aea55ecab064e84834289143e44a0",
+        "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
         "type": "github"
       },
       "original": {
@@ -554,29 +555,13 @@
         "type": "github"
       }
     },
-    "nixpkgs-stalwart-fix": {
-      "locked": {
-        "lastModified": 1762728499,
-        "narHash": "sha256-XtT/8ID3gz9RGk8ITBnktmodq5/ZG6tF60XSfuKSmro=",
-        "owner": "pyrox0",
-        "repo": "nixpkgs",
-        "rev": "b5178ff139339638e98a1e5833add22b047f96d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pyrox0",
-        "ref": "fix/stalwart-module",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1768302833,
-        "narHash": "sha256-Lfye53RXLVIu4mXNfYjaSRQL1ajKpmBQ4EdvOnXHycc=",
-        "rev": "61db79b0c6b838d9894923920b612048e1201926",
+        "lastModified": 1768569498,
+        "narHash": "sha256-Ky1RD7iduGXlB8/eIGA8lyzx+ckUt3RC7ZSo+ZNiQqc=",
+        "rev": "be5afa0fcb31f0a96bf9ecba05a516c66fcd8114",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre926999.61db79b0c6b8/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre928754.be5afa0fcb31/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -615,11 +600,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1768413535,
-        "narHash": "sha256-NXI1KfgaexVkVaZjP7xwUvNXstFg7vnxNZ1LAefLq1Q=",
+        "lastModified": 1768464392,
+        "narHash": "sha256-H3DRARqclUFdUaWgu1xQEb86/wrh41ZG0fIQJVjcZdE=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "74697fca135f059115be43e1d8c92fdb90832776",
+        "rev": "007f14a2c8d67568f4655654b401871920d73011",
         "type": "github"
       },
       "original": {
@@ -635,11 +620,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768375255,
-        "narHash": "sha256-4iRJS88M77nfMJfnszNs8FgNHpt4ldybiToMEto+qHE=",
+        "lastModified": 1768549203,
+        "narHash": "sha256-DxN7v8g8DO8gGJmgBJMo3fsSR3HEs+DFCXeKeHq61zA=",
         "owner": "quickshell-mirror",
         "repo": "quickshell",
-        "rev": "783b97152a25739340845c479d539bdd2a7c4d9c",
+        "rev": "d03c59768c680f052dff6e7a7918bbf990b0f743",
         "type": "github"
       },
       "original": {
@@ -664,7 +649,6 @@
         "my-pkgs": "my-pkgs",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-stalwart-fix": "nixpkgs-stalwart-fix",
         "nvf": "nvf",
         "quickshell": "quickshell",
         "tangled": "tangled",
@@ -789,11 +773,11 @@
         "sqlite-lib-src": "sqlite-lib-src"
       },
       "locked": {
-        "lastModified": 1768402822,
-        "narHash": "sha256-Qx8stx82wxgmGtRIfNepYC8Fa5ImUZsDFZ5uftI4VHA=",
+        "lastModified": 1768578292,
+        "narHash": "sha256-GhOaM4YIIwl8YKf8SS+V3eh01fcOOkbcmfMFv/j272w=",
         "ref": "refs/heads/master",
-        "rev": "03f953f848abd500d7c7bf12e6937107fb9a9a52",
-        "revCount": 1808,
+        "rev": "e1bcffa791fe16273993dbcf87663ac27db2f53c",
+        "revCount": 1823,
         "type": "git",
         "url": "https://tangled.org/tangled.org/core"
       },
diff --git a/flake.nix b/flake.nix
index 067d7377..2a28e46d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,6 @@
       url = "github:hercules-ci/flake-parts";
     };
     nixpkgs.url = "https://nixpkgs.dev/channel/nixpkgs-unstable";
-    nixpkgs-stalwart-fix.url = "github:pyrox0/nixpkgs/fix/stalwart-module";
     # Overrides
     flake-compat.url = "github:edolstra/flake-compat";
     flake-utils = {
diff --git a/hosts/prefect/default.nix b/hosts/prefect/default.nix
index e15dd419..2d3e16ba 100644
--- a/hosts/prefect/default.nix
+++ b/hosts/prefect/default.nix
@@ -4,11 +4,7 @@
   ...
 }:
 {
-  disabledModules = [
-    "services/mail/stalwart-mail.nix"
-  ];
   imports = [
-    "${inputs.nixpkgs-stalwart-fix}/nixos/modules/services/mail/stalwart-mail.nix"
     # Machine-specific configurations.
     ./bootloader.nix
     ./firewall.nix
-- 
2.51.2