summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Waegeneire <brice@waegenei.re>2021-07-03 20:29:02 +0200
committerGuix Patches Tester <>2021-07-03 19:31:36 +0100
commit07e85956e6cf4911d535d6a48022de9c17351752 (patch)
tree44d17bade4a2d6e00b4883e0621c12c188bcf133
parente789ce538ed848bacb8f4eb5742f78b965ccf57c (diff)
downloadguix-patches-07e85956e6cf4911d535d6a48022de9c17351752.tar
guix-patches-07e85956e6cf4911d535d6a48022de9c17351752.tar.gz
services: xorg: Do not force driver for keyboard defaults.
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. * gnu/services/xorg.scm (xorg-configuration->file)[input-class-section]: Remove matching on device path and forcing the driver. Put each option on a separate line.
-rw-r--r--gnu/services/xorg.scm15
1 files changed, 6 insertions, 9 deletions
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