From 67b0b87fd8e77a0b0bb6b37b09e5b70fa7cea713 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 29 Jul 2023 18:36:29 +0200 Subject: [PATCH] p14s, t14s: remove linux-firmware version check nixpkgs is currently using the `unstable-` version See https://github.com/NixOS/nixpkgs/commit/beb6196e9ed1f59fa9c8884b2b9e2d0eafb67bbc --- lenovo/thinkpad/p14s/amd/gen2/default.nix | 4 ---- lenovo/thinkpad/t14s/amd/gen1/default.nix | 4 ---- 2 files changed, 8 deletions(-) diff --git a/lenovo/thinkpad/p14s/amd/gen2/default.nix b/lenovo/thinkpad/p14s/amd/gen2/default.nix index 4fefc37..bc7a313 100644 --- a/lenovo/thinkpad/p14s/amd/gen2/default.nix +++ b/lenovo/thinkpad/p14s/amd/gen2/default.nix @@ -10,10 +10,6 @@ # acpi_backlight=none allows the backlight save/load systemd service to work on older kernel versions boot.kernelParams = [ "amdgpu.backlight=0" ] ++ lib.optional (lib.versionOlder config.boot.kernelPackages.kernel.version "6.1.6") "acpi_backlight=none"; - - # Wifi support - hardware.firmware = lib.mkIf (lib.versionOlder pkgs.linux-firmware.version "20230210") [ pkgs.rtw89-firmware ]; - # For mainline support of rtw89 wireless networking boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest; } diff --git a/lenovo/thinkpad/t14s/amd/gen1/default.nix b/lenovo/thinkpad/t14s/amd/gen1/default.nix index f6bb75a..470a917 100644 --- a/lenovo/thinkpad/t14s/amd/gen1/default.nix +++ b/lenovo/thinkpad/t14s/amd/gen1/default.nix @@ -1,12 +1,8 @@ - { lib, pkgs, ... }: - { imports = [ ../. ]; - # Wifi support - hardware.firmware = lib.mkIf (lib.versionOlder pkgs.linux-firmware.version "20230210") [ pkgs.rtw89-firmware ]; # For mainline support of rtw89 wireless networking boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.16") pkgs.linuxPackages_latest;