Message ID | 20210703182902.12675-1-brice@waegenei.re |
---|---|
State | New |
Headers | show |
Series | [bug#49359] services: xorg: Do not force driver for keyboard defaults. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
Brice, Brice Waegeneire 写道: > Let xorg choose the correct driver for keyboards; if need be the > driver > can be forced by the user on a device by device basis. Thanks, I think this is the right thing to do. I hope someone will test this who (1) still uses ‘real’ Xorg (2) doesn't use just the HIDs that came free with their laptop :-) I do neither. LGTM otherwise! T G-R
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 8ffea3b9dd..2c894ac6b9 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -225,27 +225,24 @@ EndSection")) (define (input-class-section layout variant model options) (string-append " Section \"InputClass\" - Identifier \"evdev keyboard catchall\" + Identifier \"keyboard defaults\" MatchIsKeyboard \"on\" - Option \"XkbLayout\" " (object->string layout) + Option \"XkbLayout\" " (object->string layout) "\n" (if variant (string-append " Option \"XkbVariant\" \"" - variant "\"") + variant "\"\n") "") (if model (string-append " Option \"XkbModel\" \"" - model "\"") + model "\"\n") "") (match options (() "") (_ (string-append " Option \"XkbOptions\" \"" - (string-join options ",") "\""))) " - - MatchDevicePath \"/dev/input/event*\" - Driver \"evdev\" -EndSection\n")) + (string-join options ",") "\"\n"))) + "EndSection\n")) (define (expand modules) ;; Append to MODULES the relevant /lib/xorg/modules