From e2e91e69248fad0cb1c3ea1975b7bd5b1391a150 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Sat, 4 Nov 2023 11:20:19 +0100
Subject: [PATCH] Improve X270 hardware experience

---
 hosts/x270.nix | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/hosts/x270.nix b/hosts/x270.nix
index b65a9ee..70b3ef0 100644
--- a/hosts/x270.nix
+++ b/hosts/x270.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, pkgs, ... }:
 {
     hardware.trackpoint = {
         enable = true;
@@ -7,14 +7,31 @@
     };
 
     services.xserver.videoDrivers = [ "modesetting" ];
+
+    boot.initrd.kernelModules = [ "i915" ];
     hardware.opengl = {
         enable = true;
-        driSupport = true;
-        driSupport32Bit = true;
+        # driSupport = true;
+        # driSupport32Bit = true;
     };
+    environment.variables = {
+        VDPAU_DRIVER = "va_gl";
+    };
+    hardware.opengl.extraPackages = with pkgs; [
+        (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
+        libvdpau-va-gl
+        intel-media-driver
+    ];
 
     console = {
-      font = "Lat2-Terminus16";
-      keyMap = "de";
+        font = "Lat2-Terminus16";
+        keyMap = "de";
     };
+
+    boot.kernelParams = [
+        # Disable ’Panel Self Refresh’. Fixes random freezes.
+        "i915.enable_psr=0"
+    ];
+
+    hardware.cpu.intel.updateMicrocode = true;
 }