From 2d1e4f2af73c9223cc359817a4064cc65b875c72 Mon Sep 17 00:00:00 2001 From: twoneis Date: Wed, 8 May 2024 15:38:26 +0200 Subject: [PATCH] configure disk differently for faster iteration --- devices/ellaca/disko.nix | 5 ----- devices/ellaca/hardware-config.nix | 17 ++++++----------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/devices/ellaca/disko.nix b/devices/ellaca/disko.nix index 7a18864..b8e38f5 100644 --- a/devices/ellaca/disko.nix +++ b/devices/ellaca/disko.nix @@ -31,10 +31,6 @@ mountOptions = [ "compress=zstd" "noatime" ]; mountpoint = "/"; }; - "/home" = { - mountOptions = [ "compress=zstd" "noatime" ]; - mountpoint = "/home"; - }; "/nix" = { mountOptions = [ "compress=zstd" "noatime" ]; mountpoint = "/nix"; @@ -45,7 +41,6 @@ }; }; - mountpoint = "/pratition-root"; swap = { swapfile = { size = "16G"; diff --git a/devices/ellaca/hardware-config.nix b/devices/ellaca/hardware-config.nix index 2e08e19..e78940f 100644 --- a/devices/ellaca/hardware-config.nix +++ b/devices/ellaca/hardware-config.nix @@ -6,31 +6,26 @@ fileSystems = { "/" = { - device = "/dev/disk/by-uuid/7d29fef5-9fdf-43b4-ad17-a94774f802b5"; + device = "/dev/nvme0n1p2"; fsType = "btrfs"; options = [ "subvol=rootfs" "compress=zstd" "noatime" ]; }; "/boot" = { - device = "/dev/disk/by-uuid/DCD8-29D7"; + device = "/dev/nvme0n1p1"; fsType = "vfat"; }; "/nix" = { - device = "/dev/disk/by-uuid/7d29fef5-9fdf-43b4-ad17-a94774f802b5"; + device = "/dev/nvme0n1p2"; fsType = "btrfs"; options = [ "subvol=nix" "compress=zstd" "noatime" ]; }; "/persist" = { - device = "/dev/disk/by-uuid/7d29fef5-9fdf-43b4-ad17-a94774f802b5"; + device = "/dev/nvme0n1p2"; fsType = "btrfs"; - options = [ "subvol=persistent" "compress=zstd" "noatime" ]; - }; - "/home" = { - device = "/dev/disk/by-uuid/7d29fef5-9fdf-43b4-ad17-a94774f802b5"; - fsType = "btrfs"; - options = [ "subvol=home" "compress=zstd" "noatime" ]; + options = [ "subvol=persist" "compress=zstd" "noatime" ]; }; "/ext" = { - device = "/dev/disk/by-uuid/90aa2cba-41dc-4efb-b509-822d1e2bc525"; + device = "/dev/sda1"; fsType = "btrfs"; options = [ "subvol=ext" "compress=zstd" "noatime" ]; };