nixos/libinput: separate settings by mouse/touchpad #108909
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,23 +3,18 @@ | |
| with lib; | ||
|
|
||
| let cfg = config.services.xserver.libinput; | ||
|
|
||
| xorgBool = v: if v then "on" else "off"; | ||
|
|
||
| mkConfigForDevice = deviceType: { | ||
| dev = mkOption { | ||
| type = types.nullOr types.str; | ||
| default = null; | ||
| example = "/dev/input/event0"; | ||
| description = | ||
| '' | ||
| Path for ${deviceType} device. Set to null to apply to any | ||
| auto-detected ${deviceType}. | ||
| ''; | ||
| }; | ||
|
|
||
|
|
@@ -185,14 +180,63 @@ in { | |
| Option "DragLockButtons" "L1 B1 L2 B2" | ||
| ''; | ||
| description = '' | ||
| Additional options for libinput ${deviceType} driver. See | ||
| <citerefentry><refentrytitle>libinput</refentrytitle><manvolnum>4</manvolnum></citerefentry> | ||
| for available options."; | ||
| ''; | ||
| }; | ||
| }; | ||
|
|
||
| mkX11ConfigForDevice = deviceType: matchIs: '' | ||
| Identifier "libinput ${deviceType} configuration" | ||
| MatchDriver "libinput" | ||
| MatchIs${matchIs} "${xorgBool true}" | ||
thiagokokada marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ${optionalString (cfg.${deviceType}.dev != null) ''MatchDevicePath "${cfg.${deviceType}.dev}"''} | ||
| Option "AccelProfile" "${cfg.${deviceType}.accelProfile}" | ||
| ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''} | ||
| ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''} | ||
| ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''} | ||
| ${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''} | ||
| Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}" | ||
| Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}" | ||
| Option "NaturalScrolling" "${xorgBool cfg.${deviceType}.naturalScrolling}" | ||
| ${optionalString (cfg.${deviceType}.scrollButton != null) ''Option "ScrollButton" "${toString cfg.${deviceType}.scrollButton}"''} | ||
| Option "ScrollMethod" "${cfg.${deviceType}.scrollMethod}" | ||
| Option "HorizontalScrolling" "${xorgBool cfg.${deviceType}.horizontalScrolling}" | ||
| Option "SendEventsMode" "${cfg.${deviceType}.sendEventsMode}" | ||
| Option "Tapping" "${xorgBool cfg.${deviceType}.tapping}" | ||
| Option "TappingDragLock" "${xorgBool cfg.${deviceType}.tappingDragLock}" | ||
| Option "DisableWhileTyping" "${xorgBool cfg.${deviceType}.disableWhileTyping}" | ||
| ${cfg.${deviceType}.additionalOptions} | ||
| ''; | ||
| in { | ||
|
|
||
| imports = | ||
| (map (option: mkRenamedOptionModule ([ "services" "xserver" "libinput" option ]) [ "services" "xserver" "libinput" "touchpad" option ]) [ | ||
| "accelProfile" | ||
| "accelSpeed" | ||
| "buttonMapping" | ||
| "calibrationMatrix" | ||
| "clickMethod" | ||
| "leftHanded" | ||
| "middleEmulation" | ||
| "naturalScrolling" | ||
| "scrollButton" | ||
| "scrollMethod" | ||
| "horizontalScrolling" | ||
| "sendEventsMode" | ||
| "tapping" | ||
| "disableWhileTyping" | ||
| "additionalOptions" | ||
| ]); | ||
|
|
||
| options = { | ||
|
|
||
| services.xserver.libinput = { | ||
| enable = mkEnableOption "libinput"; | ||
| mouse = mkConfigForDevice "mouse"; | ||
| touchpad = mkConfigForDevice "touchpad"; | ||
| }; | ||
| }; | ||
|
|
||
|
|
||
|
|
@@ -212,32 +256,10 @@ in { | |
|
|
||
| services.udev.packages = [ pkgs.libinput.out ]; | ||
|
|
||
| services.xserver.inputClassSections = [ | ||
|
There was a problem hiding this comment. As a side effect of using {
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 |
||
| (mkX11ConfigForDevice "mouse" "Pointer") | ||
| (mkX11ConfigForDevice "touchpad" "Touchpad") | ||
| ]; | ||
|
|
||
| assertions = [ | ||
| # already present in synaptics.nix | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not every option makes sense for mouse and touchpad here, so probably we will need some
mkIf deviceType == "touchpad"andmkIf 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.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I'd prefer adding the type-specific options not here but where we use the function, like
touchpad = mkConfigForDevice "touchpad" // { tapToClick = mkOption …; };There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, this makes sense. Once this PR is merged I will look at it.