From e0185b9b728657cc09e769c6c92f4347625a308c Mon Sep 17 00:00:00 2001
From: mc-fucker <dev@mc-fucker.cool>
Date: Mon, 24 Nov 2025 10:55:54 +0100
Subject: [PATCH] current drive config

---
 systems/nasty/drives.nix   | 14 +++++++++-----
 systems/nasty/snapraid.nix | 12 ++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/systems/nasty/drives.nix b/systems/nasty/drives.nix
index d172918..67464ce 100644
--- a/systems/nasty/drives.nix
+++ b/systems/nasty/drives.nix
@@ -1,23 +1,27 @@
-{ ... }:
+{ pkgs, ... }:
 let
   btrfsOpt = [ "compress-force=zstd" "nofail" "x-systemd.mount-timeout=10m" ];
   btrfsNoComp = [ "nofail" "x-systemd.mount-timeout=10m" ];
 in
 {
 
+  environment.systemPackages = with pkgs; [
+    openssl
+  ];
+
   environment.etc.crypttab = {
     text = ''
       1EJZN6MZ      UUID=da1abbcf-69ef-4bbf-847f-5df0c2a321f9 /var/lib/keyfiles/da1abbcf-69ef-4bbf-847f-5df0c2a321f9 nofail
       1EKR513Z      UUID=9dfd833d-b79f-478b-9c07-e6730f88b02f /var/lib/keyfiles/9dfd833d-b79f-478b-9c07-e6730f88b02f nofail
       1EKVK21Z      UUID=7d1b1146-a50e-405e-8d3e-df0d1fbc9451 /var/lib/keyfiles/7d1b1146-a50e-405e-8d3e-df0d1fbc9451 nofail
       43P0A00AFJDH  UUID=eff697b4-86bc-4a0e-833f-cc40e6aa001e /var/lib/keyfiles/eff697b4-86bc-4a0e-833f-cc40e6aa001e nofail
-      43P0A00FFJDH  UUID=69dc9bb1-f180-43f1-9f98-48ca592278bf /var/lib/keyfiles/69dc9bb1-f180-43f1-9f98-48ca592278bf nofail
+      43P0A00FFJDH  UUID=b6644f6f-32f6-42e3-a247-fc8314620a12 /var/lib/keyfiles/b6644f6f-32f6-42e3-a247-fc8314620a12 nofail
       53F0A0SBFJDH  UUID=d228e44f-fe1f-4eee-8415-289583ddec99 /var/lib/keyfiles/d228e44f-fe1f-4eee-8415-289583ddec99 nofail
       53G0A2AXFJDH  UUID=dd66940c-aa6e-460a-9e55-7dd08247a792 /var/lib/keyfiles/dd66940c-aa6e-460a-9e55-7dd08247a792 nofail
       53J0A016FJDH  UUID=95f84b21-d3d3-4241-8a9b-5ac46afea1e1 /var/lib/keyfiles/95f84b21-d3d3-4241-8a9b-5ac46afea1e1 nofail
       92F0A079FJDH  UUID=adf0a919-3ff2-4508-86af-9bc94573a484 /var/lib/keyfiles/adf0a919-3ff2-4508-86af-9bc94573a484 nofail
       X2N0A0AXFJDH  UUID=7b46d2e3-09da-4ef6-987f-6ffcabf79537 /var/lib/keyfiles/7b46d2e3-09da-4ef6-987f-6ffcabf79537 nofail
-      X2N0A0AZFJDH  UUID=db05ac12-2a2b-4baf-8bf0-94a3e5c9ba9e /var/lib/keyfiles/db05ac12-2a2b-4baf-8bf0-94a3e5c9ba9e nofail
+      X2N0A0AZFJDH  UUID=9bec2830-fed7-4235-ac27-7af470d2981b /var/lib/keyfiles/9bec2830-fed7-4235-ac27-7af470d2981b nofail
       ZA1D9307      UUID=79f2d993-6862-4f9c-ba2d-88f49286e356 /var/lib/keyfiles/79f2d993-6862-4f9c-ba2d-88f49286e356 nofail
       ZVV0688G      UUID=8a14aa76-5138-4cd0-8f31-0aafe63e870b /var/lib/keyfiles/8a14aa76-5138-4cd0-8f31-0aafe63e870b nofail
       ZVV072JR      UUID=416f1016-b849-4bc8-a078-4b1426788c6c /var/lib/keyfiles/416f1016-b849-4bc8-a078-4b1426788c6c nofail
@@ -136,10 +140,10 @@ in
     };
 
     "/mnt/mergerfs" = {
-      device = "/mnt/drives/ZVV0688G:/mnt/drives/ZVV072JR:/mnt/drives/ZXA0FSKT:/mnt/drives/X2N0A0AZFJDH:/mnt/drives/53G0A2AXFJDH:/mnt/drives/53J0A016FJDH:/mnt/drives/X2N0A0AXFJDH:/mnt/drives/43P0A00FFJDH:/mnt/drives/ZA1D9307:/mnt/drives/1EJZN6MZ:/mnt/drives/1EKR513Z:/mnt/drives/1EKVK21Z";
+      device = "/mnt/drives/ZVV0688G:/mnt/drives/ZVV072JR:/mnt/drives/ZXA0FSKT:/mnt/drives/92F0A079FJDH:/mnt/drives/53G0A2AXFJDH:/mnt/drives/53J0A016FJDH:/mnt/drives/X2N0A0AXFJDH:/mnt/drives/X2N0A0AZFJDH:/mnt/drives/ZA1D9307:/mnt/drives/1EJZN6MZ:/mnt/drives/1EKR513Z:/mnt/drives/1EKVK21Z";
       fsType = "fuse.mergerfs";
       options = [ "cache.files=full,,dropcacheonclose=true,category.create=mfs" "nofail" ];
-      depends = [ "/mnt/drives/ZVV0688G" "/mnt/drives/ZVV072JR" "/mnt/drives/X2N0A0AZFJDH" "/mnt/drives/53G0A2AXFJDH" "/mnt/drives/53J0A016FJDH" "/mnt/drives/X2N0A0AXFJDH" "/mnt/drives/43P0A00FFJDH" "/mnt/drives/ZA1D9307" "/mnt/drives/1EJZN6MZ" "/mnt/drives/1EKR513Z" "/mnt/drives/1EKVK21Z" "/mnt/drives/ZXA0FSKT" ];
+      depends = [ "/mnt/drives/ZVV0688G" "/mnt/drives/ZVV072JR" "/mnt/drives/92F0A079FJDH" "/mnt/drives/53G0A2AXFJDH" "/mnt/drives/53J0A016FJDH" "/mnt/drives/X2N0A0AXFJDH" "/mnt/drives/X2N0A0AZFJDH" "/mnt/drives/ZA1D9307" "/mnt/drives/1EJZN6MZ" "/mnt/drives/1EKR513Z" "/mnt/drives/1EKVK21Z" "/mnt/drives/ZXA0FSKT" ];
     };
 
     #"/mnt/box" = {
diff --git a/systems/nasty/snapraid.nix b/systems/nasty/snapraid.nix
index 0f6f7e1..8ca2716 100644
--- a/systems/nasty/snapraid.nix
+++ b/systems/nasty/snapraid.nix
@@ -19,11 +19,11 @@ in
         "/mnt/snapshot/ZVV0688G/.snapshot/"
         "/mnt/snapshot/ZVV072JR/.snapshot/"
         "/mnt/snapshot/ZXA0FSKT/.snapshot/"
-        "/mnt/snapshot/X2N0A0AZFJDH/.snapshot/"
-        "/mnt/snapshot/53G0A2AXFJDH/.snapshot/"
         "/mnt/snapshot/92F0A079FJDH/.snapshot/"
+        "/mnt/snapshot/53G0A2AXFJDH/.snapshot/"
+        "/mnt/snapshot/53J0A016FJDH/.snapshot/"
         "/mnt/snapshot/X2N0A0AXFJDH/.snapshot/"
-        "/mnt/snapshot/43P0A00FFJDH/.snapshot/"
+        "/mnt/snapshot/X2N0A0AZFJDH/.snapshot/"
         "/mnt/snapshot/ZA1D9307/.snapshot/"
         "/mnt/snapshot/1EJZN6MZ/.snapshot/"
         "/mnt/snapshot/1EKR513Z/.snapshot/"
@@ -69,11 +69,11 @@ in
       d1 =  "/mnt/snapshot/ZVV0688G/";
       d2 =  "/mnt/snapshot/ZVV072JR/";
       d3 =  "/mnt/snapshot/ZXA0FSKT/";
-      d4 =  "/mnt/snapshot/X2N0A0AZFJDH/";
+      d4 =  "/mnt/snapshot/92F0A079FJDH/";
       d5 =  "/mnt/snapshot/53G0A2AXFJDH/";
-      d6 =  "/mnt/snapshot/92F0A079FJDH/";
+      d6 =  "/mnt/snapshot/53J0A016FJDH/";
       d7 =  "/mnt/snapshot/X2N0A0AXFJDH/";
-      d8 =  "/mnt/snapshot/43P0A00FFJDH/";
+      d8 =  "/mnt/snapshot/X2N0A0AZFJDH/";
       d9 =  "/mnt/snapshot/ZA1D9307/";
       d10 = "/mnt/snapshot/1EJZN6MZ/";
       d11 = "/mnt/snapshot/1EKR513Z/";