diff options
| author | Robin Gloster <mail@glob.in> | 2019-09-03 20:31:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 20:31:44 +0200 |
| commit | 4ffa2ed1980a950b6cf705109abedddf42cf3be1 (patch) | |
| tree | 3d4bdbfeda2e2ab0d04669f1521bb18afb422c7d | |
| parent | 6016f29d62832e95ab483a22568e6d624ff08e82 (diff) | |
| parent | abca8d018021bb03faf3507fb99e855801dffba0 (diff) | |
Merge pull request #117 from Ma27/thinkpad-trackpoint-fixes
thinkpad: minor trackpoint fixes
| -rw-r--r-- | lenovo/thinkpad/default.nix | 3 | ||||
| -rw-r--r-- | lenovo/thinkpad/x1/6th-gen/default.nix | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lenovo/thinkpad/default.nix b/lenovo/thinkpad/default.nix index ff22639..99d4937 100644 --- a/lenovo/thinkpad/default.nix +++ b/lenovo/thinkpad/default.nix @@ -1,9 +1,10 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = [ ../../common/pc/laptop ]; hardware.trackpoint.enable = lib.mkDefault true; + hardware.trackpoint.emulateWheel = lib.mkDefault config.hardware.trackpoint.enable; # Fingerprint reader: login and unlock with fingerprint (if you add one with `fprintd-enroll`) # services.fprintd.enable = true; diff --git a/lenovo/thinkpad/x1/6th-gen/default.nix b/lenovo/thinkpad/x1/6th-gen/default.nix index 295c8b0..e8c6f0e 100644 --- a/lenovo/thinkpad/x1/6th-gen/default.nix +++ b/lenovo/thinkpad/x1/6th-gen/default.nix @@ -12,4 +12,8 @@ ../../../../common/pc/laptop/acpi_call.nix ../../../../common/pc/laptop/cpu-throttling-bug.nix ]; + + # New ThinkPads have a different TrackPoint manufacturer/name. + # See also https://certification.ubuntu.com/catalog/component/input/5313/input%3ATPPS/2ElanTrackPoint/ + hardware.trackpoint.device = "TPPS/2 Elan TrackPoint"; } |