From 389258a617f20514061dabe2a7a70e219e00eb4e Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@jimbosfiles.com>
Date: Thu, 24 Oct 2024 05:41:55 -0400
Subject: [PATCH] Update the hardware conf of the server

---
 hosts/cyberspark/system/hardware/default.nix | 96 ++++++++++----------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix
index 35d2138..3c433e6 100644
--- a/hosts/cyberspark/system/hardware/default.nix
+++ b/hosts/cyberspark/system/hardware/default.nix
@@ -28,6 +28,7 @@
     };
   };
 
+  # Main root
   fileSystems = {
     "/" = {
       device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
@@ -45,10 +46,15 @@
       options = [ "subvol=@nix" ];
     };
     "/var" = {
-      device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
       fsType = "btrfs";
       options = [ "subvol=@var" ];
     };
+    "/srv/minecraft" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@minecraft" ];
+    };
     "/.snapshots" = {
       device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287";
       fsType = "btrfs";
@@ -59,65 +65,61 @@
       fsType = "vfat";
       options = [ "fmask=0022" "dmask=0022" ];
     };
-    "/export/JimboNFS" = {
-      device = "/dev/disk/by-uuid/713fcd92-534c-4153-8e04-e0c6fe5f6a51";
-      fsType = "ext4";
-      noCheck = true;
-    };
 
-    # Atrocity of bindmounts
-    "/home/jimbo/JimboNFS" = {
-      device = "/export/JimboNFS";
-      fsType = "none";
-      options = [ "bind" ];
+    # Atrocity of subvols
+    "/export/JimboNFS/Downloads" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@downloads" ];
     };
-    "/mnt/nextcloud/data/JimboNFS" = {
-      device = "/export/JimboNFS";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Documents" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@docs" ];
     };
-    "/var/lib/bitwarden_rs" = {
-      device = "/export/JimboNFS/System/var/lib/bitwarden_rs";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Photos" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@photos" ];
     };
-    "/var/lib/forgejo" = {
-      device = "/export/JimboNFS/System/var/lib/forgejo";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Videos/Random" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@videos-random" ];
     };
-    "/var/lib/matrix-synapse" = {
-      device = "/export/JimboNFS/System/var/lib/matrix-synapse";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Videos/Media" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@videos-media" ];
     };
-    "/var/lib/nextcloud" = {
-      device = "/export/JimboNFS/System/var/lib/nextcloud";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Music/Synced" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@music-synced" ];
     };
-    "/var/lib/owncast" = {
-      device = "/export/JimboNFS/System/var/lib/owncast";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Music/Unsynced" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@music-unsynced" ];
     };
-    "/var/lib/mastodon" = {
-      device = "/export/JimboNFS/System/var/lib/mastodon";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Projects" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@projects" ];
     };
-    "/srv/minecraft" = {
-      device = "/export/JimboNFS/System/srv/minecraft";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/School" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@school" ];
     };
-    "/var/lib/private/photoprism/originals" = {
-      device = "/export/JimboNFS/Photos/Galleries";
-      fsType = "none";
-      options = [ "bind" ];
+    "/export/JimboNFS/Snapshots" = {
+      device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325";
+      fsType = "btrfs";
+      options = [ "subvol=@snapshots" ];
     };
   };
 
+
   swapDevices = [
     { device = "/dev/disk/by-uuid/57178cfc-3e71-4d35-8c7f-e355f9dc84df"; }
   ];