power-meter

Czichy · Dec 5, 2024 · 2067da2 · 2067da2
1 parent 37caa35
commit 2067da2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/hosts/HL-1-MRZ-HOST-01/hardware-configuration.nix b/hosts/HL-1-MRZ-HOST-01/hardware-configuration.nix
@@ -69,7 +69,18 @@
         configurationLimit = 8;
       };
     };
-    kernelPackages = pkgs.linuxPackages_latest;
+    # Newest kernels might not be supported by ZFS
+    kernelPackages = lib.mkForce pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_6_6.override {
+      argsOverride = rec {
+        src = pkgs.fetchurl {
+          url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
+          sha256 = "sha256-VeW8vGjWZ3b8RolikfCiSES+tXgXNFqFTWXj0FX6Qj4=";
+        };
+        version = "6.10.14";
+        modDirVersion = "6.10.14";
+      };
+    });
+    # kernelPackages = pkgs.linuxPackages_latest;
   };
 
   hardware = {

diff --git a/modules/nixos/system/zfs.nix b/modules/nixos/system/zfs.nix
@@ -56,7 +56,17 @@ in {
       environment.systemPackages = with pkgs; [zfs-prune-snapshots zfs];
       boot = {
         # Newest kernels might not be supported by ZFS
-        kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
+        kernelPackages = lib.mkForce pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_6_6.override {
+          argsOverride = rec {
+            src = pkgs.fetchurl {
+              url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
+              sha256 = "sha256-VeW8vGjWZ3b8RolikfCiSES+tXgXNFqFTWXj0FX6Qj4=";
+            };
+            version = "6.10.14";
+            modDirVersion = "6.10.14";
+          };
+        });
+        # kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
         # ZFS does not support swapfiles, disable hibernate and set cache max
         kernelParams = [
           "nohibernate"