.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@V27
+    - uses: cachix/install-nix-action@v26
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - name: Show nixpkgs version

README.md

@@ -192,10 +192,8 @@ See code for all available configurations.
 | [Lenovo ThinkPad L14 (Intel)](lenovo/thinkpad/l14/intel)               | `<nixos-hardware/lenovo/thinkpad/l14/intel>`            |
 | [Lenovo ThinkPad L480](lenovo/thinkpad/l480)                           | `<nixos-hardware/lenovo/thinkpad/l480>`                 |
 | [Lenovo ThinkPad P1 Gen 3](lenovo/thinkpad/p1/3th-gen)                 | `<nixos-hardware/lenovo/thinkpad/p1/3th-gen>`           |
-| [Lenovo ThinkPad P14s AMD Gen 1](lenovo/thinkpad/p14s/amd/gen1)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen1>`        |
+| [Lenovo ThinkPad P14s AMD Gen 1](lenovo/thinkpad/p14s/amd/gen1)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen1>`   |
 | [Lenovo ThinkPad P14s AMD Gen 2](lenovo/thinkpad/p14s/amd/gen2)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen2>`        |
-| [Lenovo ThinkPad P14s AMD Gen 3](lenovo/thinkpad/p14s/amd/gen3)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen3>`        |
-| [Lenovo ThinkPad P14s AMD Gen 4](lenovo/thinkpad/p14s/amd/gen4)        | `<nixos-hardware/lenovo/thinkpad/p14s/amd/gen4>`        |
 | [Lenovo ThinkPad P16s AMD Gen 1](lenovo/thinkpad/p16s/amd/gen1)        | `<nixos-hardware/lenovo/thinkpad/p16s/amd/gen1>`        |
 | [Lenovo ThinkPad P1](lenovo/thinkpad/p1)                               | `<nixos-hardware/lenovo/thinkpad/p1>`                   |
 | [Lenovo ThinkPad P50](lenovo/thinkpad/p50)                             | `<nixos-hardware/lenovo/thinkpad/p50>`                  |
@@ -205,7 +203,6 @@ See code for all available configurations.
 | [Lenovo ThinkPad T14 AMD Gen 1](lenovo/thinkpad/t14/amd/gen1)          | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen1>`         |
 | [Lenovo ThinkPad T14 AMD Gen 2](lenovo/thinkpad/t14/amd/gen2)          | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen2>`         |
 | [Lenovo ThinkPad T14 AMD Gen 3](lenovo/thinkpad/t14/amd/gen3)          | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen3>`         |
-| [Lenovo ThinkPad T14 AMD Gen 4](lenovo/thinkpad/t14/amd/gen4)          | `<nixos-hardware/lenovo/thinkpad/t14/amd/gen4>`         |
 | [Lenovo ThinkPad T14](lenovo/thinkpad/t14)                             | `<nixos-hardware/lenovo/thinkpad/t14>`                  |
 | [Lenovo ThinkPad T14s AMD Gen 1](lenovo/thinkpad/t14s/amd/gen1)        | `<nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>`        |
 | [Lenovo ThinkPad T14s](lenovo/thinkpad/t14s)                           | `<nixos-hardware/lenovo/thinkpad/t14s>`                 |

common/gpu/intel/default.nix

@@ -21,12 +21,6 @@
         libvdpau-va-gl
         intel-media-driver
       ];
-
-      hardware.opengl.extraPackages32 = with pkgs.driversi686Linux; [
-        (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
-        libvdpau-va-gl
-        intel-media-driver
-      ];
     }
   ];
 }

flake.nix

@@ -130,8 +130,6 @@
       lenovo-thinkpad-p1-gen3 = import ./lenovo/thinkpad/p1/3th-gen;
       lenovo-thinkpad-p14s-amd-gen1 = import ./lenovo/thinkpad/p14s/amd/gen1;
       lenovo-thinkpad-p14s-amd-gen2 = import ./lenovo/thinkpad/p14s/amd/gen2;
-      lenovo-thinkpad-p14s-amd-gen3 = import ./lenovo/thinkpad/p14s/amd/gen3;
-      lenovo-thinkpad-p14s-amd-gen4 = import ./lenovo/thinkpad/p14s/amd/gen4;
       lenovo-thinkpad-p16s-amd-gen1 = import ./lenovo/thinkpad/p16s/amd/gen1;
       lenovo-thinkpad-p50 = import ./lenovo/thinkpad/p50;
       lenovo-thinkpad-p51 = import ./lenovo/thinkpad/p51;
@@ -141,7 +139,6 @@
       lenovo-thinkpad-t14-amd-gen1 = import ./lenovo/thinkpad/t14/amd/gen1;
       lenovo-thinkpad-t14-amd-gen2 = import ./lenovo/thinkpad/t14/amd/gen2;
       lenovo-thinkpad-t14-amd-gen3 = import ./lenovo/thinkpad/t14/amd/gen3;
-      lenovo-thinkpad-t14-amd-gen4 = import ./lenovo/thinkpad/t14/amd/gen4;
       lenovo-thinkpad-t14s = import ./lenovo/thinkpad/t14s;
       lenovo-thinkpad-t14s-amd-gen1 = import ./lenovo/thinkpad/t14s/amd/gen1;
       lenovo-thinkpad-t410 = import ./lenovo/thinkpad/t410;

lenovo/legion/16arha7/README.md

@@ -1,6 +1,6 @@
 ## Introduction
 
-This configuration includes a fix to get the speakers working on kernels earlier than 6.9.0. Kernels after 6.9.0 already have this patch built-in.
+This configuration includes a fix to get audio playing over the speakers, however, the volume is low. If you know of a workaround or fix, please contribute it to the repo!!
 
 ## Setup at the time of testing
 ```

lenovo/legion/16arha7/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
 let
   lenovo-speaker-fix = pkgs.callPackage ./audio/lenovo-16ARHA7_speaker-fix.nix {
@@ -14,8 +14,7 @@ in
     ../../../common/pc/laptop/ssd
   ];
 
-  # Kernel 6.9 includes the speaker fix, so only install this on systems with older kernels.
+  boot.extraModulePackages = [ lenovo-speaker-fix ];
-  boot.extraModulePackages = lib.mkIf (!(lib.versionOlder config.boot.kernelPackages.kernel.version "6.9")) [ lenovo-speaker-fix ];
   
   # √(2560² + 1600²) px / 16 in ≃ 189 dpi
   services.xserver.dpi = 189;

lenovo/thinkpad/p14s/amd/gen2/default.nix

@@ -2,7 +2,6 @@
 {
   imports = [
     ../.
-    ../../../../../common/cpu/amd/pstate.nix
   ];
 
   # For suspending to RAM, set Config -> Power -> Sleep State to "Linux" in EFI.

lenovo/thinkpad/p14s/amd/gen3/default.nix

@@ -1,12 +0,0 @@
-{ lib, pkgs, ... }:
-
-{
-  imports = [
-    ../.
-    ../../../../../common/cpu/amd/pstate.nix
-  ];
-
-  # For the Qualcomm NFA-725A (Device 1103) wireless network controller
-  # See https://bugzilla.redhat.com/show_bug.cgi?id=2047878
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest;
-}

lenovo/thinkpad/p14s/amd/gen4/default.nix

@@ -1,11 +0,0 @@
-{ lib, pkgs, config, ... }:
-{
-  imports = [
-    ../.
-    ../../../../../common/cpu/amd/pstate.nix
-  ];
-
-  # For the Qualcomm NFA765 [17cb:1103] wireless network controller
-  # See https://bugzilla.redhat.com/show_bug.cgi?id=2047878
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest;
-}

lenovo/thinkpad/t14/amd/gen2/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ../.
-    ../../../../../common/cpu/amd/pstate.nix
   ];
 
   # For support of MEDIATEK Corp. Device 7961 wireless network controller, see https://lwn.net/Articles/843303/

lenovo/thinkpad/t14/amd/gen3/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ../.
-    ../../../../../common/cpu/amd/pstate.nix
   ];
 
   # For the Qualcomm NFA-725A (Device 1103) wireless network controller

lenovo/thinkpad/t14/amd/gen4/default.nix

@@ -1,12 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-{
-  imports = [
-    ../.
-    ../../../../../common/cpu/amd/pstate.nix
-  ];
-
-  # For the Qualcomm NFA765 [17cb:1103] wireless network controller
-  # See https://bugzilla.redhat.com/show_bug.cgi?id=2047878
-  boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest;
-}