diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-10-29 19:21:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-29 19:21:30 +0100 |
| commit | 46a68df837414dcdfb1c240c88d5fff1b6ef805c (patch) | |
| tree | dc95e08f3d01d37beeb9687efba2cf5f821fb382 | |
| parent | 3cffbd596197a99d10d8113860c9ddf5566c2ef3 (diff) | |
| parent | 04c79afe1c44ed49523dd26809571e6e32ed6802 (diff) | |
| download | nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.tar nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.tar.gz nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.tar.bz2 nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.tar.lz nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.tar.xz nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.tar.zst nixlib-46a68df837414dcdfb1c240c88d5fff1b6ef805c.zip | |
Merge pull request #199 from dadada/dadada/t14s
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | lenovo/thinkpad/t14s/amd/default.nix | 11 | ||||
| -rw-r--r-- | lenovo/thinkpad/t14s/amd/gen1/default.nix | 8 | ||||
| -rw-r--r-- | lenovo/thinkpad/t14s/default.nix | 6 |
5 files changed, 26 insertions, 1 deletions
diff --git a/README.md b/README.md index 8f364056eb9c..bb280055a0b6 100644 --- a/README.md +++ b/README.md @@ -101,6 +101,7 @@ See code for all available configurations. | Lenovo ThinkPad L14 (AMD) | `<nixos-hardware/lenovo/thinkpad/l14/amd> | | Lenovo ThinkPad P53 | `<nixos-hardware/lenovo/thinkpad/p53>` | | Lenovo ThinkPad T14s | `<nixos-hardware/lenovo/thinkpad/t14s>` | +| Lenovo ThinkPad T14s AMD Gen 1 | `<nixos-hardware/lenovo/thinkpad/t14s/amd/gen1>` | | Lenovo ThinkPad T410 | `<nixos-hardware/lenovo/thinkpad/t410>` | | Lenovo ThinkPad T420 | `<nixos-hardware/lenovo/thinkpad/t420>` | | Lenovo ThinkPad T430 | `<nixos-hardware/lenovo/thinkpad/t430>` | diff --git a/flake.nix b/flake.nix index da24084a3e08..592f342354a5 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,7 @@ lenovo-thinkpad-l14-amd = import ./lenovo/thinkpad/l14/amd; lenovo-thinkpad-p53 = import ./lenovo/thinkpad/p53; 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-thinkpad-t420 = import ./lenovo/thinkpad/t420; lenovo-thinkpad-t430 = import ./lenovo/thinkpad/t430; diff --git a/lenovo/thinkpad/t14s/amd/default.nix b/lenovo/thinkpad/t14s/amd/default.nix new file mode 100644 index 000000000000..2b860e847d65 --- /dev/null +++ b/lenovo/thinkpad/t14s/amd/default.nix @@ -0,0 +1,11 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ../../../../common/cpu/amd + ]; + + # For support of newer AMD GPUs, backlight and internal microphone + boot.kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.8") pkgs.linuxPackages_latest; +} diff --git a/lenovo/thinkpad/t14s/amd/gen1/default.nix b/lenovo/thinkpad/t14s/amd/gen1/default.nix new file mode 100644 index 000000000000..cb1ec7d81b76 --- /dev/null +++ b/lenovo/thinkpad/t14s/amd/gen1/default.nix @@ -0,0 +1,8 @@ + +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../. + ]; +} diff --git a/lenovo/thinkpad/t14s/default.nix b/lenovo/thinkpad/t14s/default.nix index 64957e6e06c7..d783b21a8594 100644 --- a/lenovo/thinkpad/t14s/default.nix +++ b/lenovo/thinkpad/t14s/default.nix @@ -3,10 +3,14 @@ { imports = [ ../. - ../../../common/cpu/amd ../../../common/pc/laptop/acpi_call.nix ]; + # For suspending to RAM to work, set Config -> Power -> Sleep State to "Linux" in EFI. + # See https://wiki.archlinux.org/index.php/Lenovo_ThinkPad_X1_Carbon_(Gen_6)#Suspend_issues + + # Fingerprint sensor requires a firmware-update to work. + # Force use of the thinkpad_acpi driver for backlight control. # This allows the backlight save/load systemd service to work. boot.kernelParams = [ "acpi_backlight=native" ]; |