fix: imxyy-nix-x16

config/hosts/imxyy-nix-x16/hardware.nix

@@ -6,19 +6,14 @@
   ...
 }:
 let
-  btrfs = "/dev/disk/by-uuid/0404de0a-9c4d-4c98-b3e5-b8ff8115f36c";
+  btrfs = "/dev/disk/by-uuid/69ab72d4-6ced-4f70-8b5e-aa2daa8c0b6b";
 in
 {
   boot = {
     initrd = {
       kernelModules = [ "amdgpu" ];
       availableKernelModules = [
-        "xhci_pci"
-        "ahci"
-        "nvme"
-        "usbhid"
-        "usb_storage"
-        "sd_mod"
+	"nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod"
       ];
       verbose = false;
     };
@@ -30,11 +25,6 @@ in
     kernel.sysctl = {
       "fs.file-max" = 9223372036854775807;
     };
-
-    resumeDevice = btrfs;
-    kernelParams = [
-      "resume_offset=6444127"
-    ];
   };
   services.scx.enable = true;
 
@@ -48,9 +38,9 @@ in
   };
 
   fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/843c36ae-f6d0-46a1-b5c7-8ab569e1e63f";
+    device = btrfs;
     fsType = "btrfs";
-    options = [ "compress=zstd" ];
+    options = [ "compress=zstd" "subvol=nix" ];
   };
 
   my.persist.location = "/nix/persist";
@@ -59,17 +49,7 @@ in
     fsType = "btrfs";
     options = [
       "compress=zstd"
-      "subvol=persistent"
-    ];
-    neededForBoot = true;
-  };
-
-  fileSystems."/swap" = {
-    device = btrfs;
-    fsType = "btrfs";
-    options = [
-      "compress=zstd"
-      "subvol=swap"
+      "subvol=persist"
     ];
     neededForBoot = true;
   };
@@ -100,7 +80,7 @@ in
   '';
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B7DC-E9AC";
+    device = "/dev/disk/by-uuid/96D3-93B0";
     fsType = "vfat";
     options = [
       "uid=0"
@@ -110,49 +90,6 @@ in
     ];
   };
 
-  fileSystems."/home/${username}/Documents" = {
-    device = "/dev/disk/by-uuid/a4e37dcd-764a-418c-aa1c-484f1fbd4bbe";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Downloads" = {
-    device = "/dev/disk/by-uuid/18717cb4-49ac-40fa-95d4-29523a458dd0";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Videos" = {
-    device = "/dev/disk/by-uuid/b67bbeab-58bc-4814-b5e3-08404e78b25e";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Pictures" = {
-    device = "/dev/disk/by-uuid/a31bfe7e-cc17-4bd2-af74-ae5de9be35d3";
-    fsType = "ext4";
-  };
-
-  fileSystems."/home/${username}/Music" = {
-    device = "//192.168.3.2/share/imxyy_soope_/Music";
-    fsType = "cifs";
-    options = [
-      "username=nas"
-      "password=nasshare"
-      "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"
-      "nodev"
-      "nofail"
-      "uid=1000"
-      "gid=100"
-      "vers=3"
-      "rw"
-    ];
-  };
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 32 * 1024;
-    }
-  ];
-
   networking.useDHCP = lib.mkDefault false;
 
   hardware.enableRedistributableFirmware = lib.mkDefault true;