diff --git a/devices/pleniscenta/default.nix b/devices/pleniscenta/default.nix index 5d441df..8d6b758 100644 --- a/devices/pleniscenta/default.nix +++ b/devices/pleniscenta/default.nix @@ -13,9 +13,6 @@ efi.canTouchEfiVariables = true; }; - services.zfs.autoScrub.enable = true; - services.zfs.trim.enable = true; - hardware.opengl = { enable = true; driSupport = true; diff --git a/devices/pleniscenta/hardware-config.nix b/devices/pleniscenta/hardware-config.nix index 41a9990..39209d3 100644 --- a/devices/pleniscenta/hardware-config.nix +++ b/devices/pleniscenta/hardware-config.nix @@ -6,25 +6,27 @@ }; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; - supportedFilesystems = [ "zfs" ]; }; fileSystems = { "/boot" = { - device = "/dev/disk/by-uuid/4A39-D0DF"; + device = "/dev/disk/by-uuid/A7FE-359B"; fsType = "vfat"; }; "/" = { - device = "zpool/root"; - fsType = "zfs"; + device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; + fsType = "btrfs"; + options = [ "subvol=root" "compress=zstd" "noatime" ]; }; "/nix" = { - device = "zpool/nix"; - fsType = "zfs"; + device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; + fsType = "btrfs"; + options = [ "subvol=nix" "compress=zstd" "noatime" ]; }; "/persist" = { - device = "zpool/persist"; - fsType = "zfs"; + device = "/dev/disk/by-uuid/542f188a-bcca-438a-97d3-fdaff0cacd83"; + fsType = "btrfs"; + options = [ "subvol=persist" "compress=zstd" "noatime" ]; }; };