Merge pull request #17592 from Profpatsch/libinput-docs

libinput.accelProfile: improve docs & new default

authored by Robin Gloster and committed by GitHub 4fb05dc8 f242b752

+20 -8
+7
nixos/doc/manual/release-notes/rl-1609.xml
··· 51 51 gitlab-run and gitlab-rake scripts because gitlab-runner is a component of Gitlab CI.</para> 52 52 </listitem> 53 53 54 + <listitem> 55 + <para><literal>services.xserver.libinput.accelProfile</literal> default 56 + changed from <literal>flat</literal> to <literal>adaptive</literal>, 57 + as per <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79"> 58 + official documentation</link>.</para> 59 + </listitem> 60 + 54 61 </itemizedlist> 55 62 56 63
+13 -8
nixos/modules/services/x11/hardware/libinput.nix
··· 25 25 26 26 accelProfile = mkOption { 27 27 type = types.enum [ "flat" "adaptive" ]; 28 - default = "flat"; 29 - example = "adaptive"; 28 + default = "adaptive"; 29 + example = "flat"; 30 30 description = 31 31 '' 32 - Sets the pointer acceleration profile to the given profile. Permitted values are adaptive, flat. 33 - Not all devices support this option or all profiles. If a profile is unsupported, the default profile 34 - for this is used. For a description on the profiles and their behavior, see the libinput documentation. 32 + Sets the pointer acceleration profile to the given profile. 33 + Permitted values are adaptive, flat. 34 + Not all devices support this option or all profiles. 35 + If a profile is unsupported, the default profile for this is used. 36 + <literal>flat</literal>: Pointer motion is accelerated by a constant 37 + (device-specific) factor, depending on the current speed. 38 + <literal>adaptive</literal>: Pointer acceleration depends on the input speed. 39 + This is the default profile for most devices. 35 40 ''; 36 - }; 37 - 41 + }; 42 + 38 43 accelSpeed = mkOption { 39 44 type = types.nullOr types.string; 40 45 default = null; ··· 216 221 Option "LeftHanded" "${xorgBool cfg.leftHanded}" 217 222 Option "MiddleEmulation" "${xorgBool cfg.middleEmulation}" 218 223 Option "NaturalScrolling" "${xorgBool cfg.naturalScrolling}" 219 - ${optionalString (cfg.scrollButton != null) ''Option "ScrollButton" "${cfg.scrollButton}"''} 224 + ${optionalString (cfg.scrollButton != null) ''Option "ScrollButton" "${toString cfg.scrollButton}"''} 220 225 Option "ScrollMethod" "${cfg.scrollMethod}" 221 226 Option "HorizontalScrolling" "${xorgBool cfg.horizontalScrolling}" 222 227 Option "SendEventsMode" "${cfg.sendEventsMode}"