nixos/libinput: separate settings by mouse/touchpad #108909

thiagokokada · 2021-01-10T03:59:41Z

This PR deprecates services.xserver.libinput for multiple settings, one for each kind of device:

services.xserver.libinput.mouse
services.xserver.libinput.touchpad

Looking at man 4 libinput, they basically have the same options so I simply replicated them, even if some options doesn't make sense for mouse (tapping for example).

With this commit this is now possible:

{
  services.xserver.libinput = {
    enable = true;
    mouse = {
      accelProfile = "flat";
    };
    touchpad = {
      naturalScrolling = true;
    };
  };
}

And you will have a mouse with no natural scrolling but with accel profile flat, while touchpad will have natural scrolling but accel profile adaptative (default).

It is possible to support more device types (tablets/keyboards/touchscreens), but at least looking at the
libinput manual for those devices it doesn't seem that it has any configuration options for them. They can still be configured using services.xserver.inputClassSections though, and this will work now since there is no rule by default that matches them.

Closes issue #75007, while also making configuration of mouses and touchpads using Nix attrs possible like said in PR #73785.

Alternative for #107676. This is a more elegant solution, but the other PR is much simpler, so I think both approaches are valid. So I will keep both, and closes the other one after one is merged.

Motivation for this change

Things done

thiagokokada · 2021-01-10T15:26:56Z

Rebased and tried to reduce the diff as maximum as possible to make the review easier.

thiagokokada · 2021-01-11T13:58:19Z

/marvin opt-in
/status needs_reviewer

marvin-mk2 · 2021-01-11T13:58:22Z

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

nixos-discourse · 2021-01-11T16:17:24Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/440

thiagokokada · 2021-01-12T01:47:07Z

nixos/modules/services/x11/hardware/libinput.nix

-          ${cfg.additionalOptions}
-        EndSection
-      '';
+    services.xserver.inputClassSections = [


As a side effect of using inputClassSections instead of config here, this now works as it should:

{ xserver = { enable = true; libinput = { enable = true; mouse = { naturalScrolling = true; }; }; }; inputClassSections = [ '' Identifier "natural scrolling" MatchIsPointer "on" Option "NaturalScrolling" "on" '' ]; }

You will have Natural Scrolling in a mouse in this case.

And while this may be strange, it is important to cover the cases like PR #90635 (that was reverted later). So even if we set something by default in mouse/touchpad, the user can always overwrite (this is isn't true nowadays since you can't overwrite a config with inputClassSections).

thiagokokada · 2021-01-12T01:50:46Z

CC @eadwu @Twey @pwetzel Since they were involved with PR #90635, and I believe this PR here also cover their use case.

Also CC @sylv-io @worldofpeace Since they're the authors of PR ##72774 #73785.

thiagokokada · 2021-01-12T02:23:14Z

nixos/modules/services/x11/hardware/libinput.nix


+    mkConfigForDevice = deviceType: {


Not every option makes sense for mouse and touchpad here, so probably we will need some mkIf deviceType == "touchpad" and mkIf deviceType == "mouse". But I think this can be fixed in another PR since there isn't any clear documentation if option X is never applied for Y device.

I think I'd prefer adding the type-specific options not here but where we use the function, like touchpad = mkConfigForDevice "touchpad" // { tapToClick = mkOption …; };

Yeah, this makes sense. Once this PR is merged I will look at it.

worldofpeace · 2021-01-12T17:44:02Z

Hi @thiagokokada I'm actually really interested in your PR, but my brain is like 🧻 rn so I don't think I can make a good review. Maybe @lheckemann?

lheckemann

I think this needs a release notes entry, since (correct me if I'm wrong) settings that would previously apply to mice no longer will with this change. Overall LGTM.

lheckemann · 2021-01-13T07:27:19Z

nixos/modules/services/x11/hardware/libinput.nix


+    mkConfigForDevice = deviceType: {


I think I'd prefer adding the type-specific options not here but where we use the function, like touchpad = mkConfigForDevice "touchpad" // { tapToClick = mkOption …; };

nixos/modules/services/x11/hardware/libinput.nix

This commits deprecates `services.xserver.libinput` for multiple settings, one for each kind of device: - `services.xserver.libinput.mouse` - `services.xserver.libinput.touchpad` Looking at `man 4 libinput`, they basically have the same options so I simply replicated them, even if some options doesn't make sense for mouse (`tapping` for example). With this commit this is now possible: ```nix { services.xserver.libinput = { enable = true; mouse = { accelProfile = "flat"; }; touchpad = { naturalScrolling = true; }; }; } ``` And you will have a mouse with no natural scrolling but with accel profile flat, while touchpad will have natural scrolling but accel profile adaptative (default). It is possible to support more device types (tablets/keyboards/touchscreens), but at least looking at the libinput manual for those devices it doesn't seem that it has any configuration options for them. They can still be configured using `services.xserver.inputClassSections` though, and this will work now since there is no rule by default that matches them. Closes issue #75007, while also making configuration of mouses and touchpads using Nix attrs possible like said in PR #73785.

thiagokokada · 2021-01-13T13:19:37Z

Documentation done (needed a rebase to avoid conflicts).

@lheckemann Can you please review again?

thiagokokada · 2021-01-16T01:53:17Z

@lheckemann Sorry to bother you, but can you review this PR again?

marvin-mk2 · 2021-01-19T04:10:05Z

Reminder: Please review!

This Pull Request is awaiting review. If you are the assigned reviewer, please have a look. Try to find another reviewer if necessary. If you can't, please say so. If the status is not accurate, please change it. If nothing happens, this PR ~~will be~~ should be put back in the needs_reviewer queue in one day.

Note: This feature is currently broken. The bot will not actually change the status. If you see this message multiple times, please request a status change manually.

flokli · 2021-01-21T22:38:56Z

Do we want to provide mkRenamedOptionModule entries, like we usually do when moving things around?

I updated my nixpkgs checkout, and then got the following error message:

The option `services.xserver.libinput.tappingDragLock' does not exist. Definition values:
- In `/etc/nixos/modules/profiles/xserver.nix':
    {
      _type = "if";
      condition = true;
      content = false;
    }

I mean, I figured out how to migrate, but usually we do this where feasible.

thiagokokada · 2021-01-21T22:45:46Z

@flokli Well, sorry, I was sure that I had made those renames but it seems I forgot it 😿 .

I will open a PR to fix this. Probably separate from #110350 since this is should be merged ASAP.

flokli · 2021-01-21T22:46:01Z

Thanks!

thiagokokada · 2021-01-21T22:49:29Z

@flokli Wait, yeah, I did them: https://github.com/NixOS/nixpkgs/pull/108909/files#diff-27164ac6e7f2a68c13050fa6e230c23671056d1357c534e79bb1d2969110bddeR214-R231

Well, let me investigate why they're not working. I have some tests in my #110350 branch, so this will make it easier.

thiagokokada · 2021-01-21T22:51:09Z

Whoops, found the issue. Only tappingDragLock was missing.

Ok, opening the PR ASAP.

thiagokokada · 2021-01-21T22:57:38Z

Fixed it here: #110403

Related PR NixOS#108909.

As per NixOS/nixpkgs#108909

The issue was solved by NixOS/nixpkgs/pull/108909.

ofborg bot added 6.topic: nixos 8.has: module (update) labels Jan 10, 2021

thiagokokada mentioned this pull request Jan 10, 2021

nixos/libinput: Make every option optional #107676

Closed

10 tasks

thiagokokada requested a review from worldofpeace January 10, 2021 04:08

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 8.has: documentation labels Jan 10, 2021

thiagokokada mentioned this pull request Jan 10, 2021

services.xserver.libinput: Allow configuration by input type #75007

Closed

marvin-mk2 bot added the marvin label Jan 11, 2021

marvin-mk2 bot added the needs_reviewer label Jan 11, 2021

marvin-mk2 bot added awaiting_reviewer and removed needs_reviewer labels Jan 11, 2021

thiagokokada commented Jan 12, 2021

View reviewed changes

lheckemann requested changes Jan 13, 2021

View reviewed changes

marvin-mk2 bot added awaiting_changes awaiting_reviewer and removed awaiting_reviewer awaiting_changes labels Jan 13, 2021

thiagokokada requested a review from lheckemann January 13, 2021 13:19

nixos/doc: fix manual reference to libinput

887386f

nixos/doc: document services.xserver.libinput changes

0f762e5

ofborg bot added the 8.has: changelog label Jan 13, 2021

lheckemann merged commit 5153dee into NixOS:master Jan 21, 2021

thiagokokada mentioned this pull request Jan 21, 2021

nixos/libinput: change mouse device defaults #110350

Closed

10 tasks

thiagokokada deleted the libinput-by-device-type branch January 21, 2021 18:36

thiagokokada mentioned this pull request Jan 21, 2021

nixos/libinput: add missing renamed module #110403

Merged

10 tasks

berberman pushed a commit to berberman/nixpkgs that referenced this pull request Jan 22, 2021

nixos/libinput: add missing renamed module

d8d69d4

Related PR NixOS#108909.

eadwu added a commit to eadwu/nixos-configuration that referenced this pull request Jan 25, 2021

treewide: migrate libinput configuration

fad758b

As per NixOS/nixpkgs#108909

mnacamura added a commit to mnacamura/etc-nixos that referenced this pull request May 1, 2021

Obsolete myLibinput module

fe445e4

The issue was solved by NixOS/nixpkgs/pull/108909.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

nixos/libinput: separate settings by mouse/touchpad #108909

nixos/libinput: separate settings by mouse/touchpad #108909

thiagokokada commented Jan 10, 2021 •

edited

thiagokokada commented Jan 10, 2021

thiagokokada commented Jan 11, 2021

marvin-mk2 bot commented Jan 11, 2021

nixos-discourse commented Jan 11, 2021

thiagokokada Jan 12, 2021 •

edited

thiagokokada commented Jan 12, 2021 •

edited

thiagokokada Jan 12, 2021 •

edited

lheckemann Jan 13, 2021

thiagokokada Jan 13, 2021

worldofpeace commented Jan 12, 2021

lheckemann left a comment

lheckemann Jan 13, 2021

thiagokokada commented Jan 13, 2021

thiagokokada commented Jan 16, 2021

marvin-mk2 bot commented Jan 19, 2021

flokli commented Jan 21, 2021

thiagokokada commented Jan 21, 2021

flokli commented Jan 21, 2021

thiagokokada commented Jan 21, 2021

thiagokokada commented Jan 21, 2021 •

edited

thiagokokada commented Jan 21, 2021

nixos/libinput: separate settings by mouse/touchpad #108909

nixos/libinput: separate settings by mouse/touchpad #108909

Conversation

thiagokokada commented Jan 10, 2021 • edited

Motivation for this change

Things done

thiagokokada commented Jan 10, 2021

thiagokokada commented Jan 11, 2021

marvin-mk2 bot commented Jan 11, 2021

nixos-discourse commented Jan 11, 2021

thiagokokada Jan 12, 2021 • edited

Choose a reason for hiding this comment

thiagokokada commented Jan 12, 2021 • edited

thiagokokada Jan 12, 2021 • edited

Choose a reason for hiding this comment

lheckemann Jan 13, 2021

Choose a reason for hiding this comment

thiagokokada Jan 13, 2021

Choose a reason for hiding this comment

worldofpeace commented Jan 12, 2021

lheckemann left a comment

Choose a reason for hiding this comment

lheckemann Jan 13, 2021

Choose a reason for hiding this comment

thiagokokada commented Jan 13, 2021

thiagokokada commented Jan 16, 2021

marvin-mk2 bot commented Jan 19, 2021

flokli commented Jan 21, 2021

thiagokokada commented Jan 21, 2021

flokli commented Jan 21, 2021

thiagokokada commented Jan 21, 2021

thiagokokada commented Jan 21, 2021 • edited

thiagokokada commented Jan 21, 2021

thiagokokada commented Jan 10, 2021 •

edited

thiagokokada Jan 12, 2021 •

edited

thiagokokada commented Jan 12, 2021 •

edited

thiagokokada Jan 12, 2021 •

edited

thiagokokada commented Jan 21, 2021 •

edited