From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KsBPLMOs4GC/5AAAgWs5BA (envelope-from ) for ; Sat, 03 Jul 2021 20:30:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GIx1J8Os4GD1FwAAB5/wlQ (envelope-from ) for ; Sat, 03 Jul 2021 18:30:27 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 20AC716415 for ; Sat, 3 Jul 2021 20:30:27 +0200 (CEST) Received: from localhost ([::1]:54772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzkPJ-0005Kv-SH for larch@yhetil.org; Sat, 03 Jul 2021 14:30:25 -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 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1625337027; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=avCIztabHCXxL7IerW7Ut7vl6aEJbIKjTcxUnsqy0Qg=; b=KwC/TG3z/F9hJRioLABZ4x8rxiEI/uQwNQ3Neu8kd8jq5gvSCoxya26t6hDk/Od8WNxqwa yCg64JebVX40W0xCQMLNwQtzYNczcDuHFN6AMbO1eNzJD7pMxpEEnRfPn+qApy6JbHoDkq +XSESycu/oKOxm6ervsqeh8pIs5TKYH71v2zQwiAuK4vG9uT+1lS4DlAyjSQJIPKPwKN8a GQe0VV+CpwxdSzk5QYGZCPViar6ouulTBR3JmZUQcEh3tizd0kLwbUSkpncXAa+3jBTnRK 9wFsL0rMZBY9l0/K+5qltm8AqkYwEWrOm2isL98de7la919F0U8FiYnilFOnJA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1625337027; a=rsa-sha256; cv=none; b=ZCH+5KFO+Q2i+PS5usrZS8/d4aI4sI4/+GyNZoPKCHpne6dr6gvNQC9OY+uJ8C2kJvLVDf YIza5ncP90EcGZmESGMPTXxfrLl4mNkPwRD+tMgwgsRY9WXpu1HAGuxLqqbGKOXV/hlH81 6Pwd/M4Ri5kOpuwtK0ibUUqw2asVFUxqbaBzrK8OWa6fSGLGR4dQEeyHKVqc0WJhgsr6xL 3hp3UCljfjViEAALKW5D71ycKXds/AhI5WRC+lyL03yQK3Wgtp8DEvNqQJNakuOOniZ3Ry I4StflIF9d2i+Fp3SB33NCW+3AkPDIklCx1PetcJLzRXlhWtWpBizETxvCiovQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.59 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 20AC716415 X-Spam-Score: 2.59 X-Migadu-Scanner: scn0.migadu.com X-TUID: S4EMweIC4VMZ 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