Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nixos/libinput: apply options to all device types #72774

Merged
merged 1 commit into from Nov 19, 2019

Conversation

@sylv-io
Copy link
Contributor

sylv-io commented Nov 4, 2019

Instead of assign the libinput options to touchpad devices only, it
should be appied by any device using libinput.
Due to the fact that 40-libinput.conf already defines libinput as
driver for any detected input device, we can use MatchDriver to appy
options.

Motivation for this change

NixOS libinput options do not apply to my trackpoint (Thinkpad), because it isn't a touchpad.

Things done

NixOS libinput options are now assign to any input device type using libinput.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

Instead of assign the libinput options to touchpad devices only, it
should be appied by any device using libinput.
Due to the fact that `40-libinput.conf` already defines libinput as
driver for any detected input device, we can use `MatchDriver` to appy
options.
@sylv-io

This comment has been minimized.

Copy link
Contributor Author

sylv-io commented Nov 4, 2019

@eskimor

This comment has been minimized.

Copy link
Contributor

eskimor commented Nov 4, 2019

lgtm!

@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Nov 4, 2019

Hmm, I think this should be backported. I believe in Plasma5 libinput became default and mice should be using this also for things.

Copy link
Member

worldofpeace left a comment

LGTM, need to test this though.

@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Nov 19, 2019

Ok I've now tested this.

@worldofpeace worldofpeace merged commit 687debc into NixOS:master Nov 19, 2019
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@worldofpeace

This comment has been minimized.

Copy link
Member

worldofpeace commented Nov 19, 2019

Purposed a backport in #73785.

@lheckemann

This comment has been minimized.

Copy link
Member

lheckemann commented Nov 22, 2019

This breaks touchpads by stopping the libinput driver from being associated with them. cc @7c6f434c

@sylv-io

This comment has been minimized.

Copy link
Contributor Author

sylv-io commented Nov 23, 2019

This breaks touchpads by stopping the libinput driver from being associated with them. cc @7c6f434c

40-libinput.conf, does this already.
e.g.:

[    26.242] (**) Synaptics TM3276-031: Applying InputClass "evdev touchpad catchall"
[    26.242] (**) Synaptics TM3276-031: Applying InputClass "libinput touchpad catchall"
[    26.242] (**) Synaptics TM3276-031: Applying InputClass "libinputConfiguration"

libinput touchpad catchall overrides the driver definition of evdev and libinputConfiguration does apply because it matches the driver.
Therefore it also applies to other input devices, which uses libinput.

@sylv-io sylv-io deleted the sylv-io:libinput branch Nov 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.