From 8acba4620b128aefc1de5c3a186e213930418027 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Mon, 15 Jul 2024 02:31:35 +0700
Subject: [PATCH] minor cleanup

---
 flake.lock                             | 13 ++++++-------
 flake.nix                              |  7 ++-----
 system/devices/radxa-rock5a-server.nix |  2 ++
 system/hosts/server/mailserver.nix     |  2 --
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/flake.lock b/flake.lock
index ee1c7c0..fdeeb10 100644
--- a/flake.lock
+++ b/flake.lock
@@ -356,16 +356,15 @@
     "mobile-nixos": {
       "flake": false,
       "locked": {
-        "lastModified": 1702959560,
-        "narHash": "sha256-3EmjKFKBypRGluGEY1oUMkQRBRDO5rZdzUXwTlRbUiY=",
-        "owner": "chayleaf",
+        "lastModified": 1720660935,
+        "narHash": "sha256-GnDGoVaObUjnYdCHUSIYVE1anMElis+Pq+RY30LFlIk=",
+        "owner": "NixOS",
         "repo": "mobile-nixos",
-        "rev": "55ec06035e85fcbda5caa6a73d045a9910fb16a2",
+        "rev": "31704f8a55f5773c9b4e7adb7408a142d142e1f2",
         "type": "github"
       },
       "original": {
-        "owner": "chayleaf",
-        "ref": "fix-op6-modem",
+        "owner": "NixOS",
         "repo": "mobile-nixos",
         "type": "github"
       }
@@ -550,8 +549,8 @@
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
         "repo": "nixpkgs",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index e221dd2..1f1f056 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,8 @@
   description = "NixOS + Home Manager configuration of chayleaf";
 
   inputs = {
-    #nixpkgs.url = "github:NixOS/nixpkgs/3dc2b4f8166f744c3b3e9ff8224e7c5d74a5424f";
-    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nix-community-infra.url = "github:nix-community/infra";
-    nixpkgs-kernel.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-kernel.url = "github:NixOS/nixpkgs/c7b821ba2e1e635ba5a76d299af62821cbcb09f3";
     nixpkgs.url = "github:chayleaf/nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nix-index-database = {
@@ -13,8 +11,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     mobile-nixos = {
-      # url = "github:NixOS/mobile-nixos";
-      url = "github:chayleaf/mobile-nixos/fix-op6-modem";
+      url = "github:NixOS/mobile-nixos";
       flake = false;
     };
     osu-wine = {
diff --git a/system/devices/radxa-rock5a-server.nix b/system/devices/radxa-rock5a-server.nix
index c108321..4c62d6b 100644
--- a/system/devices/radxa-rock5a-server.nix
+++ b/system/devices/radxa-rock5a-server.nix
@@ -126,7 +126,9 @@ in
                 options = [ "defaults" "size=2G" "mode=755" ]; };
     "/persist" =
               { device = "UUID=${uuids.bch}"; fsType = "bcachefs"; inherit neededForBoot;
+                # TODO: https://github.com/systemd/systemd/pull/33720/files
                 options = [
+                  "degraded"
                   "errors=ro"
                   "x-systemd.device-timeout=0"
                   "x-systemd.requires=dev-mapper-bch0.device"
diff --git a/system/hosts/server/mailserver.nix b/system/hosts/server/mailserver.nix
index 2f10e0a..2916767 100644
--- a/system/hosts/server/mailserver.nix
+++ b/system/hosts/server/mailserver.nix
@@ -46,8 +46,6 @@ 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" ''