From c75b0e1322daa5f06b971c893e3e1c47519da417 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Sun, 17 Sep 2023 23:17:40 -0500 Subject: [PATCH] fix: do not mount home in a btrfs volume This ensures Impermanence manages /home instead of btrfs. This allows the tmpfs to work as expected --- hosts/orion/os/filesystem.nix | 6 ------ install.bash | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hosts/orion/os/filesystem.nix b/hosts/orion/os/filesystem.nix index f87fce4..0e5968d 100644 --- a/hosts/orion/os/filesystem.nix +++ b/hosts/orion/os/filesystem.nix @@ -43,12 +43,6 @@ fsType = "btrfs"; options = [ "subvol=@nix" "compress=zstd" "noatime" ]; }; - - "/home" = { - device = "/dev/disk/by-label/NixOS-Primary"; - fsType = "btrfs"; - options = [ "subvol=@home" "compress=zstd" "noatime" ]; - }; }; diff --git a/install.bash b/install.bash index d789002..42030f9 100644 --- a/install.bash +++ b/install.bash @@ -50,9 +50,7 @@ mkfs.btrfs -L "${LABEL_BTRFS}" "${CRYPT_PATH}" mount -t btrfs "${CRYPT_PATH}" /mnt # Create our subvolumes -for subvol in "home" "nix"; do - btrfs subvolume create "/mnt/@${subvol}" -done +btrfs subvolume create "/mnt/@nix" umount /mnt ### Final Mountings @@ -60,7 +58,7 @@ umount /mnt mount -t tmpfs -o mode=755 none /mnt # Create our directories -mkdir /mnt/{"boot","nix","home"} +mkdir /mnt/{"boot","nix"} # Mount our boot partition mount -t vfat -o defaults,noatime "${DISK_EXT}1" /mnt/boot @@ -69,7 +67,6 @@ mount -t vfat -o defaults,noatime "${DISK_EXT}1" /mnt/boot # many cases ZLO is more performant, especially when writing, than ZSTD while having a somewhat worse comrpession ratio. # WARN: ZLO *may* be a good solution, it can be VERY slow on incompressible data. Something to keep in mind. mount -t btrfs -o noatime,compress=zstd,subvol=@nix "${CRYPT_PATH}" /mnt/nix -mount -t btrfs -o noatime,compress=zstd,subvol=@home "${CRYPT_PATH}" /mnt/home mkdir -p /mnt/nix/persist ### Install NixOS