From 857f2e39a887c0d93e0051848be8a6009f26aad7 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Thu, 4 Dec 2025 01:04:41 -0600
Subject: [PATCH] chore: switched storage drive from raid0 to raid1

---
 .../services/samba/sambaEris/default.nix      |  7 +----
 systems/ceres/config/filesystem.nix           | 26 +------------------
 systems/eris/config/filesystem.nix            | 11 +++++---
 3 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/modules/nixos/services/samba/sambaEris/default.nix b/modules/nixos/services/samba/sambaEris/default.nix
index 079bee9..d261aa1 100755
--- a/modules/nixos/services/samba/sambaEris/default.nix
+++ b/modules/nixos/services/samba/sambaEris/default.nix
@@ -17,7 +17,7 @@ in
       openFirewall = true;
       settings = {
         "raid0" = {
-          path = "/mnt/raid0";
+          path = "/mnt/storage";
           writable = "yes";
           "valid users" = user0;
           "force user" = user0;
@@ -29,11 +29,6 @@ in
     };
   };
 
-  systemd.tmpfiles.rules = [
-    "d /mnt/raid0 0755 ${user0} users -"
-    "Z /mnt/raid0 0755 ${user0} users -"
-  ];
-
   networking = {
     firewall = {
       allowedTCPPorts = [
diff --git a/systems/ceres/config/filesystem.nix b/systems/ceres/config/filesystem.nix
index 65c216c..69f5ece 100755
--- a/systems/ceres/config/filesystem.nix
+++ b/systems/ceres/config/filesystem.nix
@@ -6,31 +6,10 @@
 }:
 let
   inherit (flake.config.people) user0;
-  inherit (flake.config.machines.devices) eris;
-  erisSecrets = config.sops.secrets."network/server".path;
 
   rootDevice = "/dev/disk/by-label/root";
   bootDevice = "/dev/disk/by-label/BOOT";
 
-  sambaDrives = [
-    "samba0"
-  ];
-
-  sambaFolders = [
-    "raid0"
-  ];
-
-  sambaMounts = sambaDrive: folder: {
-    name = "${eris.${sambaDrive}.mount}/${folder}";
-    value = {
-      device = "${eris.${sambaDrive}.device}/${folder}";
-      fsType = "cifs";
-      options = eris.${sambaDrive}.options ++ [
-        "credentials=${erisSecrets}"
-      ];
-    };
-  };
-
 in
 {
   fileSystems = {
@@ -77,10 +56,7 @@ in
       neededForBoot = true;
     };
 
-  }
-  // (builtins.listToAttrs (
-    builtins.concatMap (drive: map (folder: sambaMounts drive folder) sambaFolders) sambaDrives
-  ));
+  };
 
   boot.initrd.postResumeCommands = lib.mkAfter ''
     mkdir /btrfs_tmp
diff --git a/systems/eris/config/filesystem.nix b/systems/eris/config/filesystem.nix
index 6710eb8..7e27956 100755
--- a/systems/eris/config/filesystem.nix
+++ b/systems/eris/config/filesystem.nix
@@ -38,12 +38,13 @@ in
       device = "/dev/disk/by-uuid/B645-7527";
       fsType = "vfat";
     };
-    "/mnt/raid0" = {
-      device = "/dev/md127";
+    "/mnt/storage" = {
+      device = "/dev/md0";
       fsType = "ext4";
       options = [
         "defaults"
         "nofail"
+        "x-systemd.device-timeout=10"
       ];
     };
   }
@@ -57,8 +58,12 @@ in
 
   boot.swraid.enable = true;
   boot.swraid.mdadmConf = ''
-    ARRAY /dev/md0 level=raid0 num-devices=2 metadata=1.2
+    ARRAY /dev/md0 metadata=1.2 name=eris:storage UUID=64659038:a939a18d:8cdc0f3f:97171a50
   '';
 
+  systemd.tmpfiles.rules = [
+    "d /mnt/storage 2775 root root -"
+  ];
+
   services.udisks2.enable = true;
 }