From ba9e2d4da375949a7c09ba1626b99131bbbe9c70 Mon Sep 17 00:00:00 2001 From: Andre Date: Sun, 12 May 2024 11:42:42 -0400 Subject: [PATCH 1/2] Fix display lag on Khanda --- flake.lock | 20 ++++++++++---------- hosts/Khanda/hardware-configuration.nix | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index c05292e..3b73f68 100644 --- a/flake.lock +++ b/flake.lock @@ -150,11 +150,11 @@ ] }, "locked": { - "lastModified": 1715348159, - "narHash": "sha256-nP0PJZ3dR0ols1V+w+sYBki7JlSRFvFJ8J8B00Oa7BM=", + "lastModified": 1715486357, + "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", "owner": "nix-community", "repo": "home-manager", - "rev": "223743313bab8b0b44a57eaf9573de9f69082b4d", + "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1715278311, - "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=", + "lastModified": 1715442723, + "narHash": "sha256-pXMH7lqr5bT2FjH/3tEdTT/+1+hKx+15WkcGKycWWSM=", "ref": "refs/heads/main", - "rev": "c8ab1e79ba0140bc75731c75177242089506260b", - "revCount": 75, + "rev": "87b7b7e4bd936301b139e472589d1966b136f45f", + "revCount": 76, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -296,11 +296,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715447595, + "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", "type": "github" }, "original": { diff --git a/hosts/Khanda/hardware-configuration.nix b/hosts/Khanda/hardware-configuration.nix index d5c2e00..5ff6cc4 100644 --- a/hosts/Khanda/hardware-configuration.nix +++ b/hosts/Khanda/hardware-configuration.nix @@ -66,6 +66,8 @@ "pinctrl_tigerlake" ]; extraModulePackages = [ ]; + + kernelParams = [ "i915.enable_psr=0" ]; # Disable Intel Panel Self Refresh to reduce lag and hiccups }; fileSystems = { From a2a73c1bcbcd98d93d61e7cf91adc822a7f7f86b Mon Sep 17 00:00:00 2001 From: Andre Date: Sun, 12 May 2024 12:06:08 -0400 Subject: [PATCH 2/2] 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 = {