From a2a73c1bcbcd98d93d61e7cf91adc822a7f7f86b Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Sun, 12 May 2024 12:06:08 -0400
Subject: [PATCH] Move Khanda's PSR fix into nixos-hardware

---
 flake.lock                              | 11 ++++++-----
 flake.nix                               |  4 ++--
 hosts/Khanda/hardware-configuration.nix |  2 --
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3b73f68..d67051e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -249,15 +249,16 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1715148395,
-        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
-        "owner": "NixOS",
+        "lastModified": 1715528918,
+        "narHash": "sha256-VvRyabLoTbX69HRiSmgraHqPzz+cfjMJjYxSmBPz0vg=",
+        "owner": "8bitbuddhist",
         "repo": "nixos-hardware",
-        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
+        "rev": "2e28b5160b3fb8a1950a45f65e66fcca06920ac0",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "8bitbuddhist",
+        "ref": "surface-pro-9-disable-psr",
         "repo": "nixos-hardware",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 533356b..5e4736d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
     nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1";
 
     # Hardware configurations
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
+    nixos-hardware.url = "github:8bitbuddhist/nixos-hardware/surface-pro-9-disable-psr";
 
     # Home-manager
     home-manager = {
@@ -107,7 +107,7 @@
         Khanda = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = defaultModules.base ++ [
-            nixos-hardware.nixosModules.microsoft-surface-pro-intel
+            nixos-hardware.nixosModules.microsoft-surface-pro-9
             ./hosts/Khanda
           ];
         };
diff --git a/hosts/Khanda/hardware-configuration.nix b/hosts/Khanda/hardware-configuration.nix
index 5ff6cc4..d5c2e00 100644
--- a/hosts/Khanda/hardware-configuration.nix
+++ b/hosts/Khanda/hardware-configuration.nix
@@ -66,8 +66,6 @@
       "pinctrl_tigerlake"
     ];
     extraModulePackages = [ ];
-
-    kernelParams = [ "i915.enable_psr=0" ]; # Disable Intel Panel Self Refresh to reduce lag and hiccups
   };
 
   fileSystems = {