From 122ae8476ae39d8157a244887a0eccfdc63ae29c Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 17 Jul 2022 18:19:45 +0200 Subject: [PATCH] Fix legion 7 slim 15ach6 --- lenovo/legion/15ach6/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/lenovo/legion/15ach6/default.nix b/lenovo/legion/15ach6/default.nix index 98326d1..0c71823 100644 --- a/lenovo/legion/15ach6/default.nix +++ b/lenovo/legion/15ach6/default.nix @@ -1,4 +1,6 @@ -{ lib, ... }: { +{ lib, config, ... }: +let kernelPackages = config.boot.kernelPackages; +in { imports = [ ../../../common/cpu/amd ../../../common/gpu/amd @@ -16,10 +18,19 @@ # https://wiki.archlinux.org/title/backlight#Backlight_is_always_at_full_brightness_after_a_reboot_with_amdgpu_driver systemd.services.fix-brightness = { - before = [ "systemd-backlight@backlight:amdgpu_bl0.service" ]; + before = [ + "systemd-backlight@backlight:${ + if lib.versionOlder kernelPackages.kernel.version "5.18" then "amdgpu_bl0" else "nvidia_wmi_ec_backlight" + }.service" + ]; description = "Convert 16-bit brightness values to 8-bit before systemd-backlight applies it"; script = '' - BRIGHTNESS_FILE="/var/lib/systemd/backlight/pci-0000:05:00.0:backlight:amdgpu_bl0" + BRIGHTNESS_FILE="/var/lib/systemd/backlight/${ + if lib.versionOlder kernelPackages.kernel.version "5.18" then + "pci-0000:05:00.0:backlight:amdgpu_bl0" + else + "platform-PNP0C14:00:backlight:nvidia_wmi_ec_backlight" + }" BRIGHTNESS=$(cat "$BRIGHTNESS_FILE") BRIGHTNESS=$(($BRIGHTNESS*255/65535)) BRIGHTNESS=''${BRIGHTNESS/.*} # truncating to int, just in case