Blacklist r8169 on desktop

local.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ...}:
+{ config, lib, pkgs, functions, ...}:
 
 let
   isLaptop = false;
@@ -11,7 +11,8 @@ in
     # Common modules
   ] ++ (if !isLaptop then [
     # Desktop modules
-    nct6687d
+    (functions.mkPatchedAuto nct6687d)
+    r8125
   ] else [
     # Laptop modules
   ]);
@@ -21,10 +22,15 @@ in
   ] ++ (if !isLaptop then [
     # Desktop modules
     "nct6687" # d disappears in actual module name
+    "r8125" # replaces r8169
   ] else [
     # Laptop modules
   ]);
 
+  boot.blacklistedKernelModules = [] ++ (if !isLaptop then [
+    "r8169"
+  ] else []);
+
   # CRU screen overclocking
   hardware.firmware = lib.mkIf (!isLaptop) [
     (pkgs.runCommandLocal "PHL-edid-77hz" {} ''

modules/kernel.nix

@@ -39,7 +39,7 @@
 
   boot.kernelPackages = (
     pkgs.linuxKernel.packagesFor(
-      pkgs.cachyosKernels.linux-cachyos-latest.override {
+      pkgs.cachyosKernels.linux-cachyos-rc.override {
         bbr3 = true;
         cpusched = "bore";
         lto = if isLaptop then "thin" else "full";

tamal/lock.json

@@ -1,19 +1,20 @@
 {"v":"1.2.0"
 ,"i":{
-"nixpkgs":{"sn":"nixpkgs-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/nixpkgs/archive/e52c192be9d7b2c4bd4aed326c8731b35f8bb75c.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-3lbr9GrS0IjHo0iUsk6obVHQDY8MUXDS7u7ohigcM0w="},"fv":"e52c192be9d7b2c4bd4aed326c8731b35f8bb75c","ps":[]}
+"nixpkgs":{"sn":"nixpkgs-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/nixpkgs/archive/e8273b29fe1390ec8d4603f2477357555291432e.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-bgytZK2N2lpAMQdygoKT0CTs7sUdyVPck5lLVuyvm3s="},"fv":"e8273b29fe1390ec8d4603f2477357555291432e","ps":[]}
 ,"ani-cli-git":{"sn":"ani-cli-git-src","kd":[1,{"ft":0,"ur":"https://github.com/pystardust/ani-cli/archive/b8032b72901721a1ce859ca2816e8e2c914bc616.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-vmoD/YCoSBHABOYyYNxqY5+W4YMSZ5yBoIRA6msHaHA="},"fv":"b8032b72901721a1ce859ca2816e8e2c914bc616","ps":[]}
 ,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/f2c7dd14ecce785c206a39466cbe227ff62e3803.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-2/Fs6S8wK0GSJvEx1rPMW6KWORM8TZCleAmBxQDs5oA="},"fv":"f2c7dd14ecce785c206a39466cbe227ff62e3803","ps":[]}
 ,"catppuccin-godot":{"sn":"catppuccin-godot-src","kd":[0,{"ft":0,"ur":"https://raw.githubusercontent.com/catppuccin/godot/d8b72b679078f0103a5e5c1ef793c1d698a563b1/themes/Catppuccin%20Mocha.tet","ms":[]}],"ha":{"al":2,"vl":"blake3-WVY58qsBKJlGvir08RYlS+RcjdhFvXz+7YHVfEr6tes="},"fv":"d8b72b679078f0103a5e5c1ef793c1d698a563b1","ps":[]}
 ,"dolphin-overlay":{"sn":"dolphin-overlay-src","kd":[1,{"ft":0,"ur":"https://github.com/rumboon/dolphin-overlay/archive/65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-PCS3mMGsTYXadc/DDU/EQv2T/0YORMigwUP6NEeOJW4="},"fv":"65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd","ps":["kservice_fix"]}
 ,"flake-compat":{"sn":"flake-compat-src","kd":[1,{"ft":0,"ur":"https://github.com/NixOS/flake-compat/archive/5edf11c44bc78a0d334f6334cdaf7d60d732daab.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-MmtcMfj5QuWGiFGGOdUMcaS0MSNzyV8dNCcsrPQq+Gk="},"fv":"5edf11c44bc78a0d334f6334cdaf7d60d732daab","ps":[]}
-,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/ebc87daabc8d3f595e9a8b67107eaaa8115ad582.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-eFKKMw2K/glJ+7wmUhGEmJYHgfEwkKcFEyLSmmEpYS8="},"fv":"ebc87daabc8d3f595e9a8b67107eaaa8115ad582","ps":[]}
+,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/f469c79b955609d6a8fdd9e689be76a93b1621d7.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-1zy6ntIs29Wr5aBoNIi2EUFuXTRE/mXiz4remDnDic0="},"fv":"f469c79b955609d6a8fdd9e689be76a93b1621d7","ps":[]}
 ,"hypr-darkwindow":{"sn":"hypr-darkwindow-src","kd":[1,{"ft":0,"ur":"https://github.com/micha4w/Hypr-DarkWindow/archive/refs/tags/v0.55.4.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-AtJoQQsGSDfni5oaPMefX0YRzB5JJaENw76EdQqhQyY="},"fv":"060996f5a5eb32ee8b5dc32bacc7f86411e79394424d278002e25a3eae7569c5","ps":[]}
 ,"lact-patch":{"sn":"lact-patch-src","kd":[0,{"ft":0,"ur":"https://patch-diff.githubusercontent.com/raw/ilya-zlobintsev/LACT/pull/1080.patch","ms":[]}],"ha":{"al":2,"vl":"blake3-x+HU/32454H6ZHu2i3AkdPECt9Jj4vW0Ac2jTzjpUvk="},"fv":"W/735aa2b881ef2024d0d6fcb4d2d48dd4","ps":[]}
 ,"low_latency_layer-git":{"sn":"low_latency_layer-git-src","kd":[1,{"ft":0,"ur":"https://github.com/Korthos-Software/low_latency_layer/archive/3138b14ebd059cd540444771dd184fbf7ead2a12.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-eaek3w60syOHOmRNdCDBTQ+MZw4O9fDGbpirlyuUnoQ="},"fv":"3138b14ebd059cd540444771dd184fbf7ead2a12","ps":[]}
 ,"lsfg-vk-git":{"sn":"lsfg-vk-git-src","kd":[1,{"ft":0,"ur":"https://github.com/PancakeTAS/lsfg-vk/archive/8b0da2661c6f3473a7fccc8ba643880050e71642.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-dABuL3duPZ9m0X6DizXeGCngZdlfcDpDiiuxfeTnlOM="},"fv":"8b0da2661c6f3473a7fccc8ba643880050e71642","ps":[]}
 ,"mesa-git":{"sn":"mesa-git-src","kd":[1,{"ft":0,"ur":"https://gitlab.freedesktop.org/mesa/mesa/-/archive/d02b25157c68804c4e6da613faf0f38a3bcca6d3/mesa-d02b25157c68804c4e6da613faf0f38a3bcca6d3.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-sjmSfK4dTGuLyKaBJjPaftYaz26VRYCFqAqZocEioLE="},"fv":"d02b25157c68804c4e6da613faf0f38a3bcca6d3","ps":[]}
 ,"mpv":{"sn":"mpv-src","kd":[1,{"ft":0,"ur":"https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-4u9KCKKEvSoOSO/7oZGIpnuSGcFc2rVmcJfdpFzwc5w="},"fv":"e04638a4b4eac258e679673d2a4171bde3f6c41eacb7e3d860c9a435f07eb9da","ps":["mpv_buffers_fix"]}
-,"nix-cachyos-kernel":{"sn":"nix-cachyos-kernel-src","kd":[1,{"ft":0,"ur":"https://github.com/xddxdd/nix-cachyos-kernel/archive/1740ec90e7b07730c212a3a1ff5e71af08a5270b.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-BvJTecgyIvVSPEdpDqSEItda8zAXxe9GGj2+U6djXu0="},"fv":"1740ec90e7b07730c212a3a1ff5e71af08a5270b","ps":[]}
+,"nct6687d-patch":{"sn":"nct6687d-patch-src","kd":[0,{"ft":0,"ur":"https://patch-diff.githubusercontent.com/raw/Fred78290/nct6687d/pull/186.patch","ms":[]}],"ha":{"al":2,"vl":"blake3-4wZgSze165RR4kmpLF8oMCQ8mapoyA3bn7aUeY8AiVM="},"fv":"W/346228cf70181267a790ec6c23bb540b","ps":[]}
+,"nix-cachyos-kernel":{"sn":"nix-cachyos-kernel-src","kd":[1,{"ft":0,"ur":"https://github.com/xddxdd/nix-cachyos-kernel/archive/e2100ddeb1d86fbb73afc5f9a34d9f8b6f3bbc00.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-/kfk7dxN0GoXtPWAGCXnWGPUZx8QJRiIDAKv0LTHiVM="},"fv":"e2100ddeb1d86fbb73afc5f9a34d9f8b6f3bbc00","ps":[]}
 ,"nix-cachyos-settings":{"sn":"nix-cachyos-settings-src","kd":[1,{"ft":0,"ur":"https://github.com/Daaboulex/cachyos-settings-nix/archive/47b9da37ad59e3dd92ed2155b65ad9797e03d12f.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-6BiVCakwzVi/D+cu6xn7uGCJl7JhvhX62C/mPnZcaqc="},"fv":"47b9da37ad59e3dd92ed2155b65ad9797e03d12f","ps":["adios"]}
 ,"nix-citizen":{"sn":"nix-citizen-src","kd":[1,{"ft":0,"ur":"https://github.com/LovingMelody/nix-citizen/archive/7db41f8024ff84cc5ecc532560a5b6598ca65208.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-jcIN9/pmwil9YpwT/aG4/s4K7xUEcypAu7Kufbwi+lM="},"fv":"7db41f8024ff84cc5ecc532560a5b6598ca65208","ps":[]}
 ,"nix-gaming":{"sn":"nix-gaming-src","kd":[1,{"ft":0,"ur":"https://github.com/fufexan/nix-gaming/archive/a34118c61059e72f9276680400c4f52e8b4db4dd.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-S/5Xe/7auBKOKfwrPfAc9KXVY6HpNrIXU1wVSziPsws="},"fv":"a34118c61059e72f9276680400c4f52e8b4db4dd","ps":[]}

tamal/manifest.kdl

@@ -193,12 +193,17 @@ inputs {
     }
   }
 
-  // Patches
+  // Other patches
   lact-patch { // TODO: Remove this when upstream releases a new version
     file {
       url "https://patch-diff.githubusercontent.com/raw/ilya-zlobintsev/LACT/pull/1080.patch"
     }
   }
+  nct6687d-patch { // TODO: Remove this when the package gets updated
+    file {
+      url "https://patch-diff.githubusercontent.com/raw/Fred78290/nct6687d/pull/186.patch";
+    }
+  }
 
   // Others
   catppuccin-godot {