From c7f40d8ebbb26edaa9403bf7b5fbb5ad66364aa7 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Tue, 21 Jan 2025 17:15:17 +0100
Subject: [PATCH] update to zfs 2.3

---
 hosts/minime/zfs.nix  | 17 ++---------------
 hosts/toaster/amd.nix |  2 ++
 hosts/toaster/zfs.nix | 17 ++---------------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/hosts/minime/zfs.nix b/hosts/minime/zfs.nix
index fda824e..6941995 100644
--- a/hosts/minime/zfs.nix
+++ b/hosts/minime/zfs.nix
@@ -18,21 +18,8 @@
   };
   networking.hostId = "41ba28ff";
   boot = {
-    kernelPackages =
-      let
-        zfsCompatibleKernelPackages = lib.filterAttrs (
-          name: kernelPackages:
-          (builtins.match "linux_[0-9]+_[0-9]+" name) != null
-          && (builtins.tryEval kernelPackages).success
-          && (!kernelPackages.${config.boot.zfs.package.kernelModuleAttribute}.meta.broken)
-        ) pkgs.linuxKernel.packages;
-        latestKernelPackage = lib.last (
-          lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
-            builtins.attrValues zfsCompatibleKernelPackages
-          )
-        );
-      in
-      latestKernelPackage;
+    kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
+    zfs.package = pkgs.zfs_2_3;
     supportedFilesystems = [ "zfs" ];
     kernelParams = [ "nohibernate" ];
     plymouth.enable = false;
diff --git a/hosts/toaster/amd.nix b/hosts/toaster/amd.nix
index 66a93e6..637f15d 100644
--- a/hosts/toaster/amd.nix
+++ b/hosts/toaster/amd.nix
@@ -5,6 +5,8 @@
   boot.kernelParams = [
     # use new amd pstate driver
     "amd_pstate=active"
+    # fix flicker
+    "amdgpu.dcdebugmask=0x10"
   ];
 
   #  hardware.graphics = {
diff --git a/hosts/toaster/zfs.nix b/hosts/toaster/zfs.nix
index 606627d..577e4d6 100644
--- a/hosts/toaster/zfs.nix
+++ b/hosts/toaster/zfs.nix
@@ -16,21 +16,8 @@
   };
   networking.hostId = "dca22577";
   boot = {
-    kernelPackages =
-      let
-        zfsCompatibleKernelPackages = lib.filterAttrs (
-          name: kernelPackages:
-          (builtins.match "linux_[0-9]+_[0-9]+" name) != null
-          && (builtins.tryEval kernelPackages).success
-          && (!kernelPackages.${config.boot.zfs.package.kernelModuleAttribute}.meta.broken)
-        ) pkgs.linuxKernel.packages;
-        latestKernelPackage = lib.last (
-          lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) (
-            builtins.attrValues zfsCompatibleKernelPackages
-          )
-        );
-      in
-      latestKernelPackage;
+    kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
+    zfs.package = pkgs.zfs_2_3;
     supportedFilesystems = [ "zfs" ];
     kernelParams = [ "nohibernate" ];
     plymouth.enable = false;