commit ca7b86c367897cd5fa8531423dac1f3dbfd9f270 parent d836e6cdb0c3d75d3883ad5244e54ac2ae079a41 Author: Chris <chris@echoz.io> Date: Thu, 7 May 2026 17:22:46 +0200 fix(kernel): switch to default 6.18 while waiting for zfs to catch up Diffstat:
| M | modules/boot/default.nix | | | 5 | ++++- |
| M | modules/kernel/default.nix | | | 4 | +++- |
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/boot/default.nix b/modules/boot/default.nix @@ -4,7 +4,10 @@ boot = { initrd.systemd.enable = true; - zfs.devNodes = builtins.dirOf config.disko.devices.disk.system.device; + zfs = { + devNodes = dirOf config.disko.devices.disk.system.device; + forceImportRoot = false; + }; loader = { systemd-boot.enable = true; diff --git a/modules/kernel/default.nix b/modules/kernel/default.nix @@ -1,7 +1,9 @@ { pkgs, ... }: { boot = { - kernelPackages = pkgs.linuxPackages_zen; + # kernelPackages = pkgs.linuxPackages_zen; + # held back for zfs compat + kernelPackages = pkgs.linuxPackages_6_18; zfs.package = pkgs.zfs_2_4; }; }