From f8eff138d838f8415e2be1614955de25104082bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 31 Jan 2022 06:05:05 +0100 Subject: [PATCH 1/2] fix test profile --- tests/build-profile.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/build-profile.nix b/tests/build-profile.nix index c4509d36..0d477b2d 100644 --- a/tests/build-profile.nix +++ b/tests/build-profile.nix @@ -1,8 +1,8 @@ { profile }: let - shim = { - boot.loader.systemd-boot.enable = true; + shim = { config, ... }: { + boot.loader.systemd-boot.enable = !config.boot.loader.generic-extlinux-compatible.enable && !config.boot.loader.raspberryPi.enable; fileSystems."/" = { device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; From 7dd944da98ba96170364283c75a3176d4f10e179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 1 Feb 2022 22:12:04 +0100 Subject: [PATCH 2/2] p14s: starting with 5.16 we have this kernel module upstream --- lenovo/thinkpad/p14s/amd/gen2/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lenovo/thinkpad/p14s/amd/gen2/default.nix b/lenovo/thinkpad/p14s/amd/gen2/default.nix index ee3d52ae..062ad8f0 100644 --- a/lenovo/thinkpad/p14s/amd/gen2/default.nix +++ b/lenovo/thinkpad/p14s/amd/gen2/default.nix @@ -13,9 +13,8 @@ boot.kernelParams = ["amdgpu.backlight=0" "acpi_backlight=none"]; # Wifi support - boot.extraModulePackages = [ config.boot.kernelPackages.rtw89 ]; hardware.firmware = [ pkgs.rtw89-firmware ]; # For support of newer AMD GPUs, backlight and internal microphone boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.13") pkgs.linuxPackages_latest; -} \ No newline at end of file +}