diff --git a/README.md b/README.md index 5f903f17..e73cae39 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,10 @@ Nix deployment related stuff. - [ ] Filesystem revamp of the remaining drives (SSDs). - [ ] Contemplate Windows (and the Arma drive) abandonment, moving NixOS to a ZFS mirror of the 860 and 850 EVO 250GB models. - [ ] Games on remaining 120GB SSD? -- [ ] Filesystems revamp for redundancy and media server usage. - - [ ] Format "BigExtfs" as an encrypted, perhaps compressed ZFS pool. - - [ ] Migrate the content from "BigEXT" over to the new ZFS pool. - - [ ] Format "BigEXT" to be the mirror of the drive formerly known as "BigExtfs". +- [x] Filesystems revamp for redundancy and media server usage. + - [x] Format "BigExtfs" as an encrypted, perhaps compressed ZFS pool. + - [x] Migrate the content from "BigEXT" over to the new ZFS pool. + - [x] Format "BigEXT" to be the mirror of the drive formerly known as "BigExtfs". - [ ] Excess space on the 3TiB drive should be formatted as either exFAT or ext4. - [ ] Work out any remaining quirks of this. diff --git a/configuration/hosts/samhain/hardware-configuration.nix b/configuration/hosts/samhain/hardware-configuration.nix index 40145538..4e3002c0 100644 --- a/configuration/hosts/samhain/hardware-configuration.nix +++ b/configuration/hosts/samhain/hardware-configuration.nix @@ -28,15 +28,8 @@ fsType = "vfat"; }; - fileSystems."/disks/BigEXT" = - { device = "/dev/disk/by-uuid/f9797766-59d6-4fca-9a2a-7bade7f57291"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."mewmapper".device = "/dev/disk/by-uuid/2802caf9-2dd6-4365-a022-f1359911a1db"; - - fileSystems."/disks/pool-compress" = - { device = "zstore/compress"; + fileSystems."/disks/pool-protect" = + { device = "zstore/protect"; fsType = "zfs"; }; @@ -45,8 +38,8 @@ fsType = "zfs"; }; - fileSystems."/disks/pool-protect" = - { device = "zstore/protect"; + fileSystems."/disks/pool-compress" = + { device = "zstore/compress"; fsType = "zfs"; };