From dbc235cdbf9d72f41572dd90fa0213984108feb9 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Wed, 2 Oct 2024 12:12:44 +0200
Subject: [PATCH] Blacklist k10temp on AMD Zen machines

---
 machines/loki/configuration.nix  |  3 +++
 machines/mimir/configuration.nix | 14 ++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index 84e15e9..853b636 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -133,6 +133,9 @@
       "zenpower"
       "nf_nat_ftp"
     ];
+    blacklistedKernelModules = [
+      "k10temp"
+    ];
     kernelParams = [ "amd_pstate.shared_mem=1" ];
     extraModulePackages = with config.boot.kernelPackages; [
       cpupower
diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index 0567141..05be29f 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -146,7 +146,6 @@
 
   # Use the systemd-boot EFI boot loader.
   boot = {
-    kernelPackages = pkgs.linuxPackages_6_10;
     initrd = {
       availableKernelModules = [
         "nvme"
@@ -158,15 +157,22 @@
       ];
       kernelModules = [ "dm-snapshot" ];
     };
+
+    # NVIDIA driver is broken with Linux 6.11
+    kernelPackages = pkgs.linuxPackages_6_10;
     kernelModules = [
       "kvm-amd"
       "apple-mfi-fastcharge"
       "zenpower"
     ];
-    extraModulePackages = with config.boot.kernelPackages; [
-      zenpower
-      cpupower
+    blacklistedKernelModules = [
+      "k10temp"
     ];
+    extraModulePackages = with config.boot.kernelPackages; [
+      cpupower
+      zenpower
+    ];
+
     loader = {
       systemd-boot = {
         enable = true;