diff --git a/python/installer/__main__.py b/python/installer/__main__.py index 40e9d22..cc79dd8 100644 --- a/python/installer/__main__.py +++ b/python/installer/__main__.py @@ -188,7 +188,7 @@ def create_zfs_datasets() -> None: "normalization=none", "-o", "utf8only=off", - "root_pool/nix_build", + "root_pool/nix/var/nix/builds", ) ) datasets = run_output(("zfs", "list", "-o", "name")) @@ -198,7 +198,7 @@ def create_zfs_datasets() -> None: "root_pool/home", "root_pool/var", "root_pool/nix", - "root_pool/nix_build", + "root_pool/nix/var/nix/builds", } missing_datasets = expected_datasets.difference(datasets.splitlines()) if missing_datasets: @@ -264,7 +264,7 @@ def create_nix_hardware_file(mnt_dir: str, disks: Sequence[str], encrypt: str | ' "/home" = {\n device = "root_pool/home";\n fsType = "zfs";\n };\n\n' ' "/var" = {\n device = "root_pool/var";\n fsType = "zfs";\n };\n\n' ' "/nix" = {\n device = "root_pool/nix";\n fsType = "zfs";\n };\n\n' - ' "/nix_build" = {\n device = "root_pool/nix_build";\n fsType = "zfs";\n };\n\n' + ' "/nix/var/nix/builds" = {\n device = "root_pool/nix/var/nix/builds";\n fsType = "zfs";\n };\n\n' ' "/boot" = {\n' f' device = "/dev/disk/by-uuid/{get_boot_drive_id(disks[0])}";\n' ' fsType = "vfat";\n options = [\n "fmask=0077"\n' @@ -287,7 +287,9 @@ def install_nixos(mnt_dir: str, disks: Sequence[str], encrypt: str | None) -> No run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/home", f"{mnt_dir}/home")) run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/var", f"{mnt_dir}/var")) run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/nix", f"{mnt_dir}/nix")) - run_output(("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/nix_build", f"{mnt_dir}/nix_build")) + run_output( + ("mount", "-o", "X-mount.mkdir", "-t", "zfs", "root_pool/nix/var/nix/builds", f"{mnt_dir}/nix/var/nix/builds") + ) for disk in disks: run_output(("mkfs.vfat", "-n", "EFI", f"{disk}-part1"))