From 49d65b9cb42b58c136cffef8eeb344e4651256aa Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sun, 22 Sep 2024 14:58:24 +0530
Subject: [PATCH] chore: cleanup thonkpad and use mesa git from chaotic/nyx

Trying out the experimental mesa drivers for the latest Intel Xe support on Wayland

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 systems/x86_64-linux/thonkpad/default.nix  |  6 +++++-
 systems/x86_64-linux/thonkpad/hardware.nix | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/systems/x86_64-linux/thonkpad/default.nix b/systems/x86_64-linux/thonkpad/default.nix
index ae4ccfc..c6f73c2 100644
--- a/systems/x86_64-linux/thonkpad/default.nix
+++ b/systems/x86_64-linux/thonkpad/default.nix
@@ -6,8 +6,13 @@
 }: {
   imports = [./hardware.nix];
 
+  chaotic.mesa-git.enable = true;
+
   hardware.cpu.intel.updateMicrocode = true;
   hardware.enableRedistributableFirmware = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    mesa_git.opencl
+  ];
 
   networking.hostName = "thonkpad";
   networking.interfaces.wlan0.useDHCP = lib.mkDefault false;
@@ -37,7 +42,6 @@
     extraPackages = with pkgs; [
       easyeffects
       glibc
-      logseq
       obsidian
       piper
       # terraform
diff --git a/systems/x86_64-linux/thonkpad/hardware.nix b/systems/x86_64-linux/thonkpad/hardware.nix
index 06fd38e..733e83f 100644
--- a/systems/x86_64-linux/thonkpad/hardware.nix
+++ b/systems/x86_64-linux/thonkpad/hardware.nix
@@ -9,20 +9,20 @@ _: {
         "sd_mod"
       ];
       luks.devices."cryptroot".device = "/dev/disk/by-uuid/9de352ea-128f-4d56-a720-36d81dfd9b92";
+      luks.devices."cryptroot".bypassWorkqueues = true;
     };
     kernelModules = [
       "kvm-intel"
-      "thinkpad_acpi"
-      # "iwlwifi"
+      "iwlwifi"
       "xe"
     ];
     kernelParams = [
-      "quiet"
-      "xe.force_probe=7d55"
+      # NixOS produces many wakeups per second, which is bad for battery life.
+      # This disables the timer tick on the last 7 cores.
+      "nohz_full=14-21"
       "i915.force_probe=!7d55"
+      "xe.force_probe=7d55"
       # "resume_offset=2465529"
-      "intel_pstate=active"
-      "thinkpad_acpi.fan_control=1"
     ];
     # resumeDevice = "/dev/disk/by-uuid/870fde90-a91a-4554-8b1c-d5702c789f4d";
   };