From e3259b25ebfe0afd8e1590d43950a4b9c2387de7 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 17 Jul 2022 18:19:45 +0200 Subject: [PATCH 1/2] 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 From b19015a0ba6be4cbe3a87994133e8b11ef33b6ce Mon Sep 17 00:00:00 2001 From: Mark K Gardner Date: Fri, 15 Jul 2022 08:36:55 -0400 Subject: [PATCH 2/2] Adds support for Thinkpad T460p --- README.md | 1 + flake.nix | 1 + lenovo/thinkpad/t460p/default.nix | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 lenovo/thinkpad/t460p/default.nix diff --git a/README.md b/README.md index 67b11b6..e3f3a77 100644 --- a/README.md +++ b/README.md @@ -140,6 +140,7 @@ See code for all available configurations. | [Lenovo ThinkPad T440s](lenovo/thinkpad/t440s) | `` | | [Lenovo ThinkPad T450s](lenovo/thinkpad/t450s) | `` | | [Lenovo ThinkPad T460](lenovo/thinkpad/t460) | `` | +| [Lenovo ThinkPad T460p](lenovo/thinkpad/t460p) | `` | | [Lenovo ThinkPad T460s](lenovo/thinkpad/t460s) | `` | | [Lenovo ThinkPad T470s](lenovo/thinkpad/t470s) | `` | | [Lenovo ThinkPad T480](lenovo/thinkpad/t480) | `` | diff --git a/flake.nix b/flake.nix index 652f542..7337b68 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,7 @@ lenovo-thinkpad-t440s = import ./lenovo/thinkpad/t440s; lenovo-thinkpad-t450s = import ./lenovo/thinkpad/t450s; lenovo-thinkpad-t460 = import ./lenovo/thinkpad/t460; + lenovo-thinkpad-t460p = import ./lenovo/thinkpad/t460p; lenovo-thinkpad-t460s = import ./lenovo/thinkpad/t460s; lenovo-thinkpad-t470s = import ./lenovo/thinkpad/t470s; lenovo-thinkpad-t480 = import ./lenovo/thinkpad/t480; diff --git a/lenovo/thinkpad/t460p/default.nix b/lenovo/thinkpad/t460p/default.nix new file mode 100644 index 0000000..e623371 --- /dev/null +++ b/lenovo/thinkpad/t460p/default.nix @@ -0,0 +1,9 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../../common/cpu/intel + ../../../common/pc/laptop/acpi_call.nix + ../. + ]; +}