From patchwork Sat Jul 3 18:29:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 31097 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3888527BC81; Sat, 3 Jul 2021 19:30:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE07D27BC78 for ; Sat, 3 Jul 2021 19:30:19 +0100 (BST) Received: from localhost ([::1]:54772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzkPD-0005Kv-2E for patchwork@mira.cbaines.net; Sat, 03 Jul 2021 14:30:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzkOx-0005Km-5L for guix-patches@gnu.org; Sat, 03 Jul 2021 14:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzkOw-0002zS-Tr for guix-patches@gnu.org; Sat, 03 Jul 2021 14:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzkOw-0000fo-Qy for guix-patches@gnu.org; Sat, 03 Jul 2021 14:30:02 -0400 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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