1
Fork 0

More changes please work aaaaaaa

This commit is contained in:
Matei Adriel 2023-07-18 00:48:23 +02:00
parent f618cd7a37
commit dd8353b7d4
No known key found for this signature in database
2 changed files with 8 additions and 16 deletions

View file

@ -19,7 +19,6 @@ in
networking.hostName = "lapetus"; networking.hostName = "lapetus";
# ID required by zfs. # ID required by zfs.
# Generated with `head -c 8 /etc/machine-id`.
networking.hostId = "08357db3"; networking.hostId = "08357db3";
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
@ -29,6 +28,7 @@ in
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.zfs.extraPools = [ "zroot" ]; boot.zfs.extraPools = [ "zroot" ];
boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages; boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
boot.kernelParams = [ "nohibernate" ];
# We use non-legacy mountpoints # We use non-legacy mountpoints
# See [this wiki link](https://nixos.wiki/wiki/ZFS) # See [this wiki link](https://nixos.wiki/wiki/ZFS)
@ -49,17 +49,10 @@ in
"/persist/data" = zfs; "/persist/data" = zfs;
"/persist/state" = zfs; "/persist/state" = zfs;
"/persist/local/cache" = zfs; "/persist/local/cache" = zfs;
"/boot" = { "/boot".neededForBoot = true;
neededForBoot = true;
options = [ "zfsutil" "X-mount.mkdir" ];
};
}; };
# }}} # }}}
# Boot # Boot
boot.loader.grub = { boot.loader.systemd-boot.enable = true;
inherit device;
enable = true;
version = 2;
};
} }

View file

@ -11,20 +11,19 @@
partitions = [ partitions = [
{ {
name = "ESP"; name = "ESP";
start = "1MiB"; start = "0MiB";
end = "100MiB"; end = "128Mib";
bootable = true; bootable = true;
content = { content = {
type = "filesystem"; type = "filesystem";
format = "vfat"; format = "fat32";
mountpoint = "/boot"; mountpoint = "/boot";
mountOptions = [ "defaults" ];
}; };
} }
{ {
start = "100MiB"; name = "zfs";
start = "128MiB";
end = "100%"; end = "100%";
name = "primary";
content = { content = {
type = "zfs"; type = "zfs";
pool = "zroot"; pool = "zroot";