From unknown Fri Jun 13 11:26:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49359] [PATCH] services: xorg: Do not force driver for keyboard defaults. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 18:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49359 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49359@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16253369542498 (code B ref -1); Sat, 03 Jul 2021 18:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2021 18:29:14 +0000 Received: from localhost ([127.0.0.1]:39857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzkOA-0000eE-BQ for submit@debbugs.gnu.org; Sat, 03 Jul 2021 14:29:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:42154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzkO8-0000e5-FQ for submit@debbugs.gnu.org; Sat, 03 Jul 2021 14:29:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzkO8-0005Da-6Q for guix-patches@gnu.org; Sat, 03 Jul 2021 14:29:12 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:59011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzkO4-0002Mh-Vb for guix-patches@gnu.org; Sat, 03 Jul 2021 14:29:11 -0400 Received: (Authenticated sender: brice@waegenei.re) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 6ED55FF802 for ; Sat, 3 Jul 2021 18:29:06 +0000 (UTC) From: Brice Waegeneire Date: Sat, 3 Jul 2021 20:29:02 +0200 Message-Id: <20210703182902.12675-1-brice@waegenei.re> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.199; envelope-from=brice@waegenei.re; helo=relay9-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) 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. --- gnu/services/xorg.scm | 15 ++++++--------- 1 file 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 -- 2.31.1 From unknown Fri Jun 13 11:26:12 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49359] [PATCH] services: xorg: Do not force driver for keyboard defaults. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 03 Jul 2021 18:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49359 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 49359@debbugs.gnu.org X-Debbugs-Original-Cc: 49359@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16253382104524 (code B ref -1); Sat, 03 Jul 2021 18:51:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jul 2021 18:50:10 +0000 Received: from localhost ([127.0.0.1]:39874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzkiP-0001Au-Vt for submit@debbugs.gnu.org; Sat, 03 Jul 2021 14:50:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:45510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzkiN-0001Al-34 for submit@debbugs.gnu.org; Sat, 03 Jul 2021 14:50:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzkiM-0000F9-Q1 for guix-patches@gnu.org; Sat, 03 Jul 2021 14:50:06 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:58596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzkiK-0007Nr-OR for guix-patches@gnu.org; Sat, 03 Jul 2021 14:50:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=2+oes1izRQodH dR3a6h8WhS5octOKLrH7Vki5/qdERo=; h=in-reply-to:date:subject:cc:to: from:references; d=tobias.gr; b=mSnSBTgPsaPe9MUQyB9X2N+W4yN/Uj/chcpVXg wtk5fQg3wuksTWIptB7lf7gHxiNwSdnYO8s//KxumFIjHVPIHeEGyC9XKR87FGNKfHEghU W1nnvKRJfhBSMvaTGV24icIdVlvYPnsBVaRV4K8JeHtmDHtvxKrwpYWbbTUvT7s3LOuciT 7tuyBIa/nElRwatj+IQXa9n5ewNmYC8ITMGQLUKxStKMLkt4jWvwf6R7UiLSjchhdr7AZv qE18p/AMeRP7PL2x5IxYRTAddDnuRardnnl8wErLrbVeKhV2OWk6JXuds5ekXYgpAkC04U ZGPLq0pKczfZO9ixAJvtoqfg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id d2bb7b82 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Sat, 3 Jul 2021 18:49:55 +0000 (UTC) References: <20210703182902.12675-1-brice@waegenei.re> From: Tobias Geerinckx-Rice Date: Sat, 03 Jul 2021 20:46:16 +0200 In-reply-to: <20210703182902.12675-1-brice@waegenei.re> BIMI-Selector: v=BIMI1; s=default; Message-ID: <87k0m7s04r.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Brice, Brice Waegeneire =E5=86=99=E9=81=93=EF=BC=9A > Let xorg choose the correct driver for keyboards; if need be the=20 > 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 =E2=80=98real=E2=80=99 Xor= g (2)=20 doesn't use just the HIDs that came free with their laptop :-) I=20 do neither. LGTM otherwise! T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCYOCxVQ0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15/jcBAITTlctanVBgemANH3aGGtsRBvocVF1OpJZ8ZgYc eoFsAP45Qhzo/GWEVruAU8Xw0FNTrONgiBNVqajrqomJOu6ODw== =znhq -----END PGP SIGNATURE----- --=-=-=--