From 3e15f3a9f3544770766ce6d695c5cc1aeb406e4e Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 25 Feb 2023 10:45:39 -0500 Subject: add new hardware config for glados --- hosts/glados/hardware-configuration.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/hosts/glados/hardware-configuration.nix b/hosts/glados/hardware-configuration.nix index 20d2eda..b96530a 100644 --- a/hosts/glados/hardware-configuration.nix +++ b/hosts/glados/hardware-configuration.nix @@ -18,31 +18,33 @@ boot.extraModulePackages = []; fileSystems."/" = { - device = "rpool/nixos/root"; - fsType = "zfs"; - options = ["zfsutil" "X-mount.mkdir"]; + device = "/dev/mapper/cryptroot"; + fsType = "btrfs"; + options = ["subvol=root" "compress=zstd" "noatime"]; }; - fileSystems."/home" = { - device = "rpool/nixos/home"; - fsType = "zfs"; - options = ["zfsutil" "X-mount.mkdir"]; + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/bbbc1f37-53f5-4776-a70e-f2779179de50"; + + fileSystems."/var/log" = { + device = "/dev/mapper/cryptroot"; + fsType = "btrfs"; + options = ["subvol=var_log" "compress=zstd" "noatime"]; }; fileSystems."/nix" = { - device = "rpool/nixos/nixstore"; - fsType = "zfs"; - options = ["zfsutil" "X-mount.mkdir"]; + device = "/dev/mapper/cryptroot"; + fsType = "btrfs"; + options = ["subvol=nix" "compress=zstd" "noatime" "nodatacow"]; }; - fileSystems."/var/log" = { - device = "rpool/nixos/var/log"; - fsType = "zfs"; - options = ["zfsutil" "X-mount.mkdir"]; + fileSystems."/home" = { + device = "/dev/mapper/cryptroot"; + fsType = "btrfs"; + options = ["subvol=home" "compress=zstd" "noatime"]; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5B1B-6423"; + device = "/dev/disk/by-uuid/B95B-9412"; fsType = "vfat"; }; -- cgit v1.2.3