Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ceea7ec7b5ea
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 72a2ced25234
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 19, 2019

  1. nixos/libinput: apply options to all device types 

    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.

(cherry picked from commit d616928)
    @sylv-io @worldofpeace
    sylv-io authored and worldofpeace committed Nov 19, 2019
    Copy the full SHA
    ea83c79 View commit details

Commits on Dec 3, 2019

  1. Merge pull request #73785 from worldofpeace/libinput-options-all-19.09 

    [19.09] nixos/libinput: apply options to all device types
    @worldofpeace
    worldofpeace authored Dec 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    72a2ced View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 nixos/modules/services/x11/hardware/libinput.nix
6 changes: 3 additions & 3 deletions nixos/modules/services/x11/hardware/libinput.nix
View file
Original file line number Diff line number Diff line change
@@ -209,12 +209,12 @@ in {

services.xserver.config =
''
# Automatically enable the libinput driver for all touchpads.
# General libinput configuration.
# See CONFIGURATION DETAILS section of man:libinput(4).
Section "InputClass"
Identifier "libinputConfiguration"
MatchIsTouchpad "on"
MatchDriver "libinput"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
Driver "libinput"
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}