Richie/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fixed typo
treefmt / nix fmt (pull_request) Failing after 4s
Details
build_systems / build-portal-1 (pull_request) Successful in 32s
Details
pytest / pytest (pull_request) Successful in 34s
Details
test ebook search / test-ebook-search (pull_request) Successful in 40s
Details
build_systems / build-brain (pull_request) Successful in 1m0s
Details
build_systems / build-bob (pull_request) Successful in 1m4s
Details
build_systems / build-jeeves (pull_request) Successful in 1m17s
Details
build_systems / build-rhapsody-in-green (pull_request) Successful in 1m18s
Details

Browse Source
This commit is contained in:
Richie
2026-09-11 11:43:08 -04:00
parent 500ac863d8
commit bbb2403093
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/installer/__main__.py
+6 -4
View File
@@ -188,7 +188,7 @@ def create_zfs_datasets() -> None:
"normalization=none", "normalization=none",
"-o", "-o",
"utf8only=off", "utf8only=off",
"root_pool/nix_build", "root_pool/nix/var/nix/builds",
) )
) )
datasets = run_output(("zfs", "list", "-o", "name")) datasets = run_output(("zfs", "list", "-o", "name"))
@@ -198,7 +198,7 @@ def create_zfs_datasets() -> None:
"root_pool/home", "root_pool/home",
"root_pool/var", "root_pool/var",
"root_pool/nix", "root_pool/nix",
"root_pool/nix_build", "root_pool/nix/var/nix/builds",
} }
missing_datasets = expected_datasets.difference(datasets.splitlines()) missing_datasets = expected_datasets.difference(datasets.splitlines())
if missing_datasets: 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' ' "/home" = {\n device = "root_pool/home";\n fsType = "zfs";\n };\n\n'
' "/var" = {\n device = "root_pool/var";\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" = {\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' ' "/boot" = {\n'
f' device = "/dev/disk/by-uuid/{get_boot_drive_id(disks[0])}";\n' f' device = "/dev/disk/by-uuid/{get_boot_drive_id(disks[0])}";\n'
' fsType = "vfat";\n options = [\n "fmask=0077"\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/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/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", 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: for disk in disks:
run_output(("mkfs.vfat", "-n", "EFI", f"{disk}-part1")) run_output(("mkfs.vfat", "-n", "EFI", f"{disk}-part1"))