From unknown Sat Jun 21 10:38:59 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#47994 <47994@debbugs.gnu.org> To: bug#47994 <47994@debbugs.gnu.org> Subject: Status: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Reply-To: bug#47994 <47994@debbugs.gnu.org> Date: Sat, 21 Jun 2025 17:38:59 +0000 retitle 47994 [PATCH] services: kmscon: Add xkb-layout and xkb-options fiel= ds. reassign 47994 guix-patches submitter 47994 luhui severity 47994 normal tag 47994 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 24 11:55:12 2021 Received: (at submit) by debbugs.gnu.org; 24 Apr 2021 15:55:12 +0000 Received: from localhost ([127.0.0.1]:41322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laKcg-0000Qm-Km for submit@debbugs.gnu.org; Sat, 24 Apr 2021 11:55:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:38300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laBDv-0004DR-OL for submit@debbugs.gnu.org; Sat, 24 Apr 2021 01:53:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laBDv-0005A6-G7 for guix-patches@gnu.org; Sat, 24 Apr 2021 01:52:59 -0400 Received: from m12-11.163.com ([220.181.12.11]:40590) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1laBDp-0003fT-6U for guix-patches@gnu.org; Sat, 24 Apr 2021 01:52:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=FKEcD v9yRzrvmC7Pa0zVv5yuBtqOIVyrZORgOgHcxaM=; b=RHH7RdOygOG2ronHXMTjF o7FM8lg2me0kXzAmj6whzMg4J3JcIB/HN42GiH0FeGhYqeIACPd29H/TauTpce96 xfDy0C2wBxc3hw7G16/2xAMS0xTScyYmkp5XotnQlP7zHpOKpdjHk1M7OI3CAF7A fhCHSQfLR7t+6Spwgwz1XQ= Received: from localhost (unknown [110.178.47.120]) by smtp7 (Coremail) with SMTP id C8CowAB3PHaVroNgn11UYw--.41532S3; Sat, 24 Apr 2021 13:37:25 +0800 (CST) Date: Sat, 24 Apr 2021 13:37:25 +0800 From: luhui To: guix-patches@gnu.org Subject: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Message-ID: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="pLn8EtsU+vvorGTR" Content-Disposition: inline X-CM-TRANSID: C8CowAB3PHaVroNgn11UYw--.41532S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUfiL0UUUUU X-Originating-IP: [110.178.47.120] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/1tbi6wV+DFXlvy3qMQABsk Received-SPF: pass client-ip=220.181.12.11; envelope-from=luhuins@163.com; helo=m12-11.163.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Sat, 24 Apr 2021 11:55:09 -0400 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 (--) --pLn8EtsU+vvorGTR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Added xkb-layout and xkb-options fields to adjust the keyboard layout of kmscon --pLn8EtsU+vvorGTR Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-services-kmscon-Add-xkb-layout-and-xkb-options-field.patch" >From 02ae9ab208f83974eac92dcbeb74091b0670cef7 Mon Sep 17 00:00:00 2001 From: luhui Date: Sat, 24 Apr 2021 10:56:03 +0800 Subject: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. * gnu/services/base.scm (): Add xkb-layout and xkb-options fields. * doc/guix.texi (Base Services): Document them. Signed-off-by: luhui --- doc/guix.texi | 6 ++++++ gnu/services/base.scm | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b9019d5550..e92c57e84c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15254,6 +15254,12 @@ Font engine used in Kmscon. @item @code{font-size} (default: @code{12}) Font size used in Kmscon. +@item @code{xkb-layout} (default: @code{#f}) +Keyboard layout used in Kmscon. + +@item @code{xkb-options} (default: @code{#f}) +Keyboard layout options used in Kmscon. + @item @code{kmscon} (default: @var{kmscon}) The Kmscon package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 24b3ea785b..2c442416b7 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2313,7 +2313,11 @@ This service is not part of @var{%base-services}." (font-engine kmscon-configuration-font-engine (default "pango")) (font-size kmscon-configuration-font-size - (default 12))) + (default 12)) + (xkb-layout kmscon-configuration-xkb-layout + (default #f)) + (xkb-options kmscon-configuration-xkb-options + (default #f))) (define kmscon-service-type (shepherd-service-type @@ -2326,7 +2330,9 @@ This service is not part of @var{%base-services}." (auto-login (kmscon-configuration-auto-login config)) (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)) (font-engine (kmscon-configuration-font-engine config)) - (font-size (kmscon-configuration-font-size config))) + (font-size (kmscon-configuration-font-size config)) + (xkb-layout (kmscon-configuration-xkb-layout config)) + (xkb-options (kmscon-configuration-xkb-options config))) (define kmscon-command #~(list @@ -2335,6 +2341,8 @@ This service is not part of @var{%base-services}." "--no-switchvt" ;Prevent a switch to the virtual terminal. "--font-engine" #$font-engine "--font-size" #$(number->string font-size) + #$@(if xkb-layout (list "--xkb-layout" xkb-layout) '()) + #$@(if xkb-options (list "--xkb-options" xkb-options) '()) #$@(if hardware-acceleration? '("--hwaccel") '()) "--login" "--" #$login-program #$@login-arguments -- 2.31.1 --pLn8EtsU+vvorGTR-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 25 05:12:40 2021 Received: (at 47994) by debbugs.gnu.org; 25 Apr 2021 09:12:40 +0000 Received: from localhost ([127.0.0.1]:41997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laaoh-0002FI-PY for submit@debbugs.gnu.org; Sun, 25 Apr 2021 05:12:39 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laaof-0002F9-Bz for 47994@debbugs.gnu.org; Sun, 25 Apr 2021 05:12:38 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id wxCb2400D0mfAB401xCbSM; Sun, 25 Apr 2021 11:12:35 +0200 Message-ID: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. From: Maxime Devos To: luhui , 47994@debbugs.gnu.org Date: Sun, 25 Apr 2021 11:12:10 +0200 In-Reply-To: References: Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-Q6rOtZGrG/ZU5z9E/i1C" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1619341955; bh=zRDJp6CpteBR08YbEtM/yUnbr/7msXb1UYtceHYLw0o=; h=Subject:From:To:Date:In-Reply-To:References; b=owr7/kS86WTEYhuCIB0EFZX3L45Saw6wY8Q0T34icipxbakpfgYEnIlxAI0Io/B52 RbAWxvKQs4xvEP1QCxVtWRLsf2SQ6IfCpuTp68YbDU7xgh50yLRBeQ/rYYvcA/dITX rFYmbtE7LUkQMFw6n3WFGiwWYAU2c1dzWqcri+7XNtO2tr3BBwVWoBXa08h8ijcrji QlAOYMYP1/EudUOwYLZnoT+NU4nm731+FuOCbfl81Wppqh5OJPUP1Xc9Rk7EYbauK3 FlJoSME9Ev2ukigsDUMkaxq6ay9aWNVCXxBRxFuLjGK0fBv/3+tRJfhZzLKJs58x6g 6tAqntyd3/Ffg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47994 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: -1.7 (-) --=-Q6rOtZGrG/ZU5z9E/i1C Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable luhui schreef op za 24-04-2021 om 13:37 [+0800]: > @item @code{xkb-layout} (default: @code{#f}) > Keyboard layout used in Kmscon. What is the default here, is this a package object, a file-like object, a string, where can I find a list of keyboard layouts ... please document! > @item @code{xkb-options} (default: @code{#f}) > Keyboard layout options used in Kmscon. What are the possible options, is this a list, a string, a list of strings,= ... please document! > Signed-off-by: luhui Guix uses Signed-off-by differently from LKML. IIUC, Signed-off-by is used= when committing on behalf of someone else, and is added by the committer. The line would b= e something like Signed-off-by: Some Guix Committer As you added a few things to doc/guix.texi and gnu/services/base.scm, you can add a copyright line there. Otherwise, I don't see any obvious problems, but I haven't tested. Greetings, Maxime. --=-Q6rOtZGrG/ZU5z9E/i1C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYIUyahccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7qaVAP9upcPILIittDRJhtFZoQ2uZakq sl0NYR+OBwNBxrlt0QD9FrRQhlJCB9JbSF7MoB0OynOZ+JejSux9iBTWijkzNA8= =y+nM -----END PGP SIGNATURE----- --=-Q6rOtZGrG/ZU5z9E/i1C-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 25 06:04:41 2021 Received: (at 47994) by debbugs.gnu.org; 25 Apr 2021 10:04:41 +0000 Received: from localhost ([127.0.0.1]:42033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1labd3-0003Y4-2q for submit@debbugs.gnu.org; Sun, 25 Apr 2021 06:04:41 -0400 Received: from m12-18.163.com ([220.181.12.18]:34769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1labcy-0003Xr-Ua for 47994@debbugs.gnu.org; Sun, 25 Apr 2021 06:04:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=/y6bH REwU+4DUgw2HHFEtARI7wL7mZ85/wd3Tuz9+hI=; b=OEGgr2dQi3j9s8eOCCY+p bYMlmuXGQ8f9CLruuyOuo+130LQsB3gbFMwldK3DlXl4r5vXeJNiQZRajyJje+Tc ePr3khriYNtkAYcf62jbrGWoOP0/9bhT52k98Pb8dPc+pR+LvgtTCv/FnDckFhL6 QdthnLqiivcoaD/9xy45w4= Received: from localhost (unknown [110.178.47.120]) by smtp14 (Coremail) with SMTP id EsCowADHk9WuPoVgPoBBfw--.17163S3; Sun, 25 Apr 2021 18:04:31 +0800 (CST) Date: Sun, 25 Apr 2021 18:04:30 +0800 From: luhui To: Maxime Devos Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Message-ID: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="FYK+08Q2PiYqzPtP" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> X-CM-TRANSID: EsCowADHk9WuPoVgPoBBfw--.17163S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU0hL0UUUUU X-Originating-IP: [110.178.47.120] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/1tbiMg9-DFWBtxn4ggAAsO X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org, luhui 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: -1.0 (-) --FYK+08Q2PiYqzPtP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline ok, new patch: --FYK+08Q2PiYqzPtP Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-services-kmscon-Add-xkb-layout-and-xkb-options-field.patch" Content-Transfer-Encoding: 8bit >From 17c626839fb397e8c6f40d2855623f7181d0ab31 Mon Sep 17 00:00:00 2001 From: luhui Date: Sat, 24 Apr 2021 10:56:03 +0800 Subject: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. * gnu/services/base.scm (): Add xkb-layout and xkb-options fields. * doc/guix.texi (Base Services): Document them. --- doc/guix.texi | 9 +++++++++ gnu/services/base.scm | 13 +++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b9019d5550..e8007c3965 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -88,6 +88,7 @@ Copyright @copyright{} 2020 John Soo@* Copyright @copyright{} 2020 Jonathan Brielmaier@* Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@* +Copyright @copyright{} 2021 lu hui@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -15254,6 +15255,14 @@ Font engine used in Kmscon. @item @code{font-size} (default: @code{12}) Font size used in Kmscon. +@item @code{xkb-layout} (default: @code{#f}) +When true, this field be a string used for set keyboard layout used in Kmscon. +See the @code{xkeyboard-config} package for valid layouts. + +@item @code{xkb-options} (default: @code{#f}) +When true, this field be a string used for set keyboard layout options used in +Kmscon. See the @code{xkeyboard-config} package for valid options. + @item @code{kmscon} (default: @var{kmscon}) The Kmscon package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 24b3ea785b..bee101ab29 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 qblade +;;; Copyright © 2021 luhui ;;; ;;; This file is part of GNU Guix. ;;; @@ -2313,7 +2314,11 @@ This service is not part of @var{%base-services}." (font-engine kmscon-configuration-font-engine (default "pango")) (font-size kmscon-configuration-font-size - (default 12))) + (default 12)) + (xkb-layout kmscon-configuration-xkb-layout + (default #f)) ;string | #f + (xkb-options kmscon-configuration-xkb-options + (default #f))) ;string | #f (define kmscon-service-type (shepherd-service-type @@ -2326,7 +2331,9 @@ This service is not part of @var{%base-services}." (auto-login (kmscon-configuration-auto-login config)) (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)) (font-engine (kmscon-configuration-font-engine config)) - (font-size (kmscon-configuration-font-size config))) + (font-size (kmscon-configuration-font-size config)) + (xkb-layout (kmscon-configuration-xkb-layout config)) + (xkb-options (kmscon-configuration-xkb-options config))) (define kmscon-command #~(list @@ -2335,6 +2342,8 @@ This service is not part of @var{%base-services}." "--no-switchvt" ;Prevent a switch to the virtual terminal. "--font-engine" #$font-engine "--font-size" #$(number->string font-size) + #$@(if xkb-layout (list "--xkb-layout" xkb-layout) '()) + #$@(if xkb-options (list "--xkb-options" xkb-options) '()) #$@(if hardware-acceleration? '("--hwaccel") '()) "--login" "--" #$login-program #$@login-arguments -- 2.31.1 --FYK+08Q2PiYqzPtP-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 25 08:46:38 2021 Received: (at 47994) by debbugs.gnu.org; 25 Apr 2021 12:46:38 +0000 Received: from localhost ([127.0.0.1]:42207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lae9m-0005gO-A2 for submit@debbugs.gnu.org; Sun, 25 Apr 2021 08:46:38 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:49706) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lae9j-0005gE-IL for 47994@debbugs.gnu.org; Sun, 25 Apr 2021 08:46:36 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id x0mZ2400B0mfAB4010mZLk; Sun, 25 Apr 2021 14:46:34 +0200 Message-ID: Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. From: Maxime Devos To: luhui Date: Sun, 25 Apr 2021 14:46:25 +0200 In-Reply-To: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-EbUcFUzAqy9LUdaCsBRV" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1619354794; bh=9o14Y14ZPL4mSepyknZfrGBor3Tu7sMzlPbZouVZwvs=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=DHnaLRGg87itNEPs7pO33kbMu7f1QUljxgqNs5wco9U1mBHBX1MKEtHZnWR9QW+te Y9Nl8JEcGj7cC4q+mNhGpjrb2N0XDJUk+40Ej2wGgQasmmFhSehOJssw5kV3yNkceV iHAmZiCv46lvspmGAfuFiWcc5uMaPOH+WDRC0F14iS1cuQmIP+mNqfSm8oGrfxilal 7o0sXty1osGsezm3q4FnXqOot9nCOxtsL6xjJ7A/OSnwZxHOO3E8X9Jnnevz4FOmQP V95+mVGImYnNVgN2jS2xnbv705D/0PE7m8Lww2Igx434qG83ltciWOVXQgVIv6HEHg TVl/bV6OqIrbw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org 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: -1.7 (-) --=-EbUcFUzAqy9LUdaCsBRV Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable luhui schreef op zo 25-04-2021 om 18:04 [+0800]: > +@item @code{xkb-layout} (default: @code{#f}) > +When true, this field be a string used for set keyboard layout used in K= mscon. > +See the @code{xkeyboard-config} package for valid layouts. > + > +@item @code{xkb-options} (default: @code{#f}) > +When true, this field be a string used for set keyboard layout options u= sed in > +Kmscon. See the @code{xkeyboard-config} package for valid options. I looked in the guix manual for ideas how to formulate this clearer. The section =E2=80=9810.6 Keyboard layout=E2=80=99 () seems interesting, in particualr the "keyboard-layout" procedure from (gnu = system keyboard). It seemed a nicer abstraction than just raw strings. An extract from the manual: Keyboard layouts are represented by records created by the =E2=80=98keyboard-layout=E2=80=99 procedure of =E2=80=98(gnu system keyboar= d)=E2=80=99. Following the X Keyboard extension (XKB), each layout has four attributes: a name (often a language code such as =E2=80=9Cfi=E2=80=9D for Finnish or =E2=80=9Cjp=E2= =80=9D for Japanese), an optional variant name, an optional keyboard model name, and a possibly empty list of additional options. In most cases the layout name is all you care about. -- Scheme Procedure: keyboard-layout NAME [VARIANT] [#:model] [#:options '()] Return a new keyboard layout with the given NAME and VARIANT. NAME must be a string such as =E2=80=98"fr"=E2=80=99; VARIANT must be = a string such as =E2=80=98"bepo"=E2=80=99 or =E2=80=98"nodeadkeys"=E2=80=99. See th= e =E2=80=98xkeyboard-config=E2=80=99 package for valid options. Here are a few examples: ;; The German QWERTZ layout. Here we assume a standard ;; "pc105" keyboard model. (keyboard-layout "de") ;; The b=C3=A9po variant of the French layout. (keyboard-layout "fr" "bepo") Could this be used instead of raw strings? > +When true, this field be a string used for set keyboard layout used in K= mscon. When true, this field is a string representing the name of the keyboard lay= out. Suggested documentation (based on the xorg-configuration documentation): @item @code{keboard-layout} (default: @code{#f}) If this is false, Kmscon uses the default keyboard layout. Otherwise this must be a field is a =E2=80=98keyboard layout=E2=80=99 objec= t specifying the keyboard layout to use for the console. *Note Keyboard Layout::, for more information on how to specify the keyboard layout. Greetings, Maxime. --=-EbUcFUzAqy9LUdaCsBRV Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYIVkoRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iSDAPsHnU+NSstDxbkqiFgwrGWd6DkL edu5BnQvxENMnW5jZQEA1UlFcBVfRLkWJLRJaizHcXiDFkH5S1QgzL41Nh/6ng4= =arVX -----END PGP SIGNATURE----- --=-EbUcFUzAqy9LUdaCsBRV-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 25 22:07:28 2021 Received: (at 47994) by debbugs.gnu.org; 26 Apr 2021 02:07:28 +0000 Received: from localhost ([127.0.0.1]:44091 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laqel-0008Q0-R8 for submit@debbugs.gnu.org; Sun, 25 Apr 2021 22:07:28 -0400 Received: from m12-15.163.com ([220.181.12.15]:47152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1laqei-0008Pl-F7 for 47994@debbugs.gnu.org; Sun, 25 Apr 2021 22:07:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=hJJu7 6yEI6ipy4g6hWzaVfhJAHaTuPzb7CjZFZTvEaM=; b=B93hmf9Dkw0EXyT3v4DUq CA1WIsOTZTQz9CB6WE7t9Z2Wb1dN4yeftikys8p/HJG+XsQA0VUR9kwEbBTl4sCv 5LjrEpF/+Z39rcN8kU7P1LWg535gBNVSFUt8ACercUEsB74UQyujtKHXKgCCtRE0 Tfgs4ei9lc0oOik0vUwrbE= Received: from localhost (unknown [110.178.47.120]) by smtp11 (Coremail) with SMTP id D8CowAC3399IIIZg9n1IAw--.22992S3; Mon, 26 Apr 2021 10:07:18 +0800 (CST) Date: Mon, 26 Apr 2021 10:07:03 +0800 From: luhui To: Maxime Devos Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Message-ID: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="NUNBHy/ESFyMFLW9" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-CM-TRANSID: D8CowAC3399IIIZg9n1IAw--.22992S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUbjjgDUUUU X-Originating-IP: [110.178.47.120] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/1tbiMhaADFWBtyH2TwAAsT X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org, luhui 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: -1.0 (-) --NUNBHy/ESFyMFLW9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline OK,Re-written the code according to your suggestion. new patch: --NUNBHy/ESFyMFLW9 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-services-kmscon-Add-keyboard-layout-fields.patch" Content-Transfer-Encoding: 8bit >From 49450d3f87bebb0eeb5a2d4a161151b33d413c15 Mon Sep 17 00:00:00 2001 From: luhui Date: Sat, 24 Apr 2021 10:56:03 +0800 Subject: [PATCH] services: kmscon: Add keyboard-layout fields. * gnu/services/base.scm (): Add keyboard-layout fields. * doc/guix.texi (Base Services): Document it. --- doc/guix.texi | 9 +++++++++ gnu/services/base.scm | 21 +++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index b9019d5550..74e9ceaf5e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -88,6 +88,7 @@ Copyright @copyright{} 2020 John Soo@* Copyright @copyright{} 2020 Jonathan Brielmaier@* Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@* +Copyright @copyright{} 2021 lu hui@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -15254,6 +15255,14 @@ Font engine used in Kmscon. @item @code{font-size} (default: @code{12}) Font size used in Kmscon. +@item @code{keyboard-layout} (default: @code{#f}) +If this is @code{#f}, Kmscon uses the default keyboard layout---usually US +English (``qwerty'') for a 105-key PC keyboard. + +Otherwise this must be a @code{keyboard-layout} object specifying the keyboard +layout. @xref{Keyboard Layout}, for more information on how to specify the +keyboard layout. + @item @code{kmscon} (default: @var{kmscon}) The Kmscon package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 24b3ea785b..0878746fa8 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 qblade +;;; Copyright © 2021 luhui ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu system shadow) ; 'user-account', etc. #:use-module (gnu system uuid) #:use-module (gnu system file-systems) ; 'file-system', etc. + #:use-module (gnu system keyboard) #:use-module (gnu system mapped-devices) #:use-module ((gnu system linux-initrd) #:select (file-system-packages)) @@ -2313,7 +2315,9 @@ This service is not part of @var{%base-services}." (font-engine kmscon-configuration-font-engine (default "pango")) (font-size kmscon-configuration-font-size - (default 12))) + (default 12)) + (keyboard-layout kmscon-configuration-keyboard-layout + (default #f))) ; #f | (define kmscon-service-type (shepherd-service-type @@ -2326,7 +2330,8 @@ This service is not part of @var{%base-services}." (auto-login (kmscon-configuration-auto-login config)) (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)) (font-engine (kmscon-configuration-font-engine config)) - (font-size (kmscon-configuration-font-size config))) + (font-size (kmscon-configuration-font-size config)) + (keyboard-layout (kmscon-configuration-keyboard-layout config))) (define kmscon-command #~(list @@ -2335,6 +2340,18 @@ This service is not part of @var{%base-services}." "--no-switchvt" ;Prevent a switch to the virtual terminal. "--font-engine" #$font-engine "--font-size" #$(number->string font-size) + #$@(if keyboard-layout + (let* ((layout (keyboard-layout-name keyboard-layout)) + (variant (keyboard-layout-variant keyboard-layout)) + (model (keyboard-layout-model keyboard-layout)) + (options (keyboard-layout-options keyboard-layout))) + `("--xkb-layout" ,layout + ,@(if variant `("--xkb-layout" ,variant) '()) + ,@(if model `("--xkb-model" ,model) '()) + ,@(if (null? options) + '() + `("--xkb-options" ,(string-join options ","))))) + '()) #$@(if hardware-acceleration? '("--hwaccel") '()) "--login" "--" #$login-program #$@login-arguments -- 2.31.1 --NUNBHy/ESFyMFLW9-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 26 15:23:35 2021 Received: (at 47994) by debbugs.gnu.org; 26 Apr 2021 19:23:35 +0000 Received: from localhost ([127.0.0.1]:47221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb6pT-00082W-HP for submit@debbugs.gnu.org; Mon, 26 Apr 2021 15:23:35 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:37674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lb6pQ-00082M-VQ for 47994@debbugs.gnu.org; Mon, 26 Apr 2021 15:23:33 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id xXPW2400M0mfAB406XPXQ0; Mon, 26 Apr 2021 21:23:31 +0200 Message-ID: Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. From: Maxime Devos To: luhui Date: Mon, 26 Apr 2021 21:23:00 +0200 In-Reply-To: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-eJlkGGBWTLIJGw2uw8A6" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1619465011; bh=7pgE3XH14J4DpqvvJf5SEZUkYn2tVhgX6TAy2vvx4yY=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=d/jG+VDIpypzP+7c6H4Fh4hwMV1pME99TFX61/E1lnoxytoEO2InJ21a77MAXDqiN BNrZkR5vxBPxhfN/iGEBDuy8J/gUu0j23meQI86YqdZy0bgM8mvUi62id6pWaz7/dX AecfkmvAv7WKltPtif5htDIXeHzZpes+z/sw889ibNLLYcLQhgY/Yw72aPkQgbSVOZ wZqgcMJVpotA3rZfbqVTmQ/l8pIyO81HHQovx1xAiDXyG1FC4SV9nGAmWNI0h+cOnJ t86s5EUUX3gw1yYR3N/NCmPclnI4veQG1D1P0HDjjX0x69uamLsPHCcg2vVxPzv2+s SFZYXv7zPMcCA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org 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: -1.7 (-) --=-eJlkGGBWTLIJGw2uw8A6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable luhui schreef op ma 26-04-2021 om 10:07 [+0800]: > OK,Re-written the code according to your suggestion. >=20 > new patch: The new patch looks good to me, but I haven't tested it. Greetings, Maxime. --=-eJlkGGBWTLIJGw2uw8A6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYIcTFxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7sQgAP9+IICygjMRTwDn+Iw9v8EZBa5H 7DP9DFNd3N2DOessIAEAk2BoqVN7HxqP6jgiNFOPFjdl1EM4VeSZ51HyQ/9TPQI= =VK3J -----END PGP SIGNATURE----- --=-eJlkGGBWTLIJGw2uw8A6-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 07:33:01 2021 Received: (at 47994) by debbugs.gnu.org; 4 May 2021 11:33:01 +0000 Received: from localhost ([127.0.0.1]:52669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldtIT-0004Wd-JU for submit@debbugs.gnu.org; Tue, 04 May 2021 07:33:01 -0400 Received: from m12-16.163.com ([220.181.12.16]:46961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldtIQ-0004WX-Nf for 47994@debbugs.gnu.org; Tue, 04 May 2021 07:33:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=KNjxz v+yIuyfGkfSXXsgh6marZCmxlovzZ69EcZcLdQ=; b=WbmfXCAIuZPZWrT1kw//N ZfElyOrgcy+OV3sgXsg1WwbkDLx8F9rRzmeAZ1J9+C+T26vIYmTIa/JrzB4X2Jz8 NI+yla0kmbq73zafqboBgtcqXZFbBMs/+WROKmBTKzPi2FxfMLtVos10g7egL9KA mL/bw7tB5NwR94dIDPI07I= Received: from localhost (unknown [110.183.12.194]) by smtp12 (Coremail) with SMTP id EMCowABnK2niMJFgx9_dpA--.46654S3; Tue, 04 May 2021 19:32:51 +0800 (CST) Date: Tue, 4 May 2021 19:32:49 +0800 From: luhui To: Maxime Devos Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Message-ID: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CM-TRANSID: EMCowABnK2niMJFgx9_dpA--.46654S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kw45JF1Utr1xJw1fAr43Wrg_yoW8Gr13pa 9rWF18Ca1Yq3WFkwn3XryxGr15Wws3CFyfXr4DWasFqFWUCr90vrnakryY9ws7Ar18Jr1j qayUWF1F934UZ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jzT5dUUUUU= X-Originating-IP: [110.183.12.194] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/xtbBQgCIDF++LoawwAABs+ X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org, luhui 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: -0.5 (/) On Mon, Apr 26, 2021 at 09:23:00PM +0200, Maxime Devos wrote: > luhui schreef op ma 26-04-2021 om 10:07 [+0800]: > > OK,Re-written the code according to your suggestion. > > > > new patch: > > The new patch looks good to me, but I haven't tested it. write it in a vm configuration test code: #+BEGIN_SRC scheme ;; need delete getty service (tty3,tty4,tty5,tty6) (dbus-service) (syslog-service) ;; default (service kmscon-service-type (kmscon-configuration (virtual-terminal "tty3"))) ;; us (service kmscon-service-type (kmscon-configuration (virtual-terminal "tty4") (keyboard-layout (keyboard-layout "us")))) ;; us with ctrl:nocaps options (service kmscon-service-type (kmscon-configuration (virtual-terminal "tty5") (keyboard-layout (keyboard-layout "us" #:options '("ctrl:nocaps"))))) ;; with all args (service kmscon-service-type (kmscon-configuration (virtual-terminal "tty6") (keyboard-layout (keyboard-layout "us" "intl" #:model "macbook78" #:options '("ctrl:nocaps" "compose:menu"))))) #+END_SRC then guix system vm vm-configuration.scm xxxxxxxxxx-vm.sh # need graphic in vm: herd status # ensure services is running # test Ctrl + Alt + F3 # ensure it is us keyboard layout Ctrl + Alt + F4 # ensure it is us keyboard layout Ctrl + Alt + F5 # ensure Caps Locks is Ctrl ... From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 04 08:40:33 2021 Received: (at 47994) by debbugs.gnu.org; 4 Jun 2021 12:40:33 +0000 Received: from localhost ([127.0.0.1]:45759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lp97p-0000bS-Ko for submit@debbugs.gnu.org; Fri, 04 Jun 2021 08:40:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lp97n-0000bF-UD for 47994@debbugs.gnu.org; Fri, 04 Jun 2021 08:40:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33834) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lp97f-0004Py-J7; Fri, 04 Jun 2021 08:40:23 -0400 Received: from [2a01:e0a:19b:d9a0:f2f7:a404:c3d3:f8b4] (port=42160 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lp97f-0005of-As; Fri, 04 Jun 2021 08:40:23 -0400 From: Mathieu Othacehe To: luhui Subject: Re: bug#47994: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> Date: Fri, 04 Jun 2021 14:40:21 +0200 In-Reply-To: (luhui's message of "Mon, 26 Apr 2021 10:07:03 +0800") Message-ID: <87bl8lerbe.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org, Maxime Devos 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: -3.3 (---) Hello, > + ,@(if variant `("--xkb-layout" ,variant) '()) This is supposed to be "--xkb-variant" here, right? Otherwise, it looks good to me. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 21 11:27:40 2021 Received: (at 47994) by debbugs.gnu.org; 21 Jun 2021 15:27:41 +0000 Received: from localhost ([127.0.0.1]:36823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvLps-0001Jp-HX for submit@debbugs.gnu.org; Mon, 21 Jun 2021 11:27:40 -0400 Received: from m12-16.163.com ([220.181.12.16]:57369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvLpo-0001JX-W9 for 47994@debbugs.gnu.org; Mon, 21 Jun 2021 11:27:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=yOnAk 7FC55yveEMjSLJ1fN29tFm83GxerKz9sFQY67Q=; b=i0i7WhRfgiFvd1EsYzIym GzXPO9aAD/CYQawia9z6mt8TrbAeU2o1vts6WqqHwo/dhUv4IVtt3/2tv6HUL7cw Lw+IE/ktysTxubtoU1K1Qg/QdQ/fsHG7mAAoT+pyRqLuFJPS6d4P0mJiJ0nLmmja 0504yr7mVfzamGgfSsJaaY= Received: from localhost (unknown [223.104.197.242]) by smtp12 (Coremail) with SMTP id EMCowAC3w4zfr9BggRcVyg--.54044S3; Mon, 21 Jun 2021 23:27:28 +0800 (CST) Date: Mon, 21 Jun 2021 23:28:34 +0800 From: luhui To: Mathieu Othacehe Subject: Re: bug#47994: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Message-ID: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> <87bl8lerbe.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="lfrZAGjQXGvRdgbB" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87bl8lerbe.fsf_-_@gnu.org> X-CM-TRANSID: EMCowAC3w4zfr9BggRcVyg--.54044S3 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRoa0yUUUUU X-Originating-IP: [223.104.197.242] X-CM-SenderInfo: 5oxk3xlqv6il2tof0z/1tbiDwC4DFUMYiA1XwAAsK X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47994 Cc: 47994@debbugs.gnu.org, luhui , Maxime Devos 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: -1.0 (-) --lfrZAGjQXGvRdgbB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 04, 2021 at 02:40:21PM +0200, Mathieu Othacehe wrote: > > Hello, > > > + ,@(if variant `("--xkb-layout" ,variant) '()) > > This is supposed to be "--xkb-variant" here, right? Sorry, made this mistake, now I fixed it and sent a new patch. > > Otherwise, it looks good to me. > > Thanks, > > Mathieu --lfrZAGjQXGvRdgbB Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-services-kmscon-Add-keyboard-layout-fields.patch" Content-Transfer-Encoding: 8bit >From 310ff049da9e6ea7f0556430b0b51580a675d696 Mon Sep 17 00:00:00 2001 From: luhui Date: Mon, 21 Jun 2021 22:58:06 +0800 Subject: [PATCH] services: kmscon: Add keyboard-layout fields. * gnu/services/base.scm (): Add keyboard-layout fields. * doc/guix.texi (Base Services): Document it. --- doc/guix.texi | 9 +++++++++ gnu/services/base.scm | 21 +++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 66c6adc4f5..eb151a56fb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -91,6 +91,7 @@ Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@* Copyright @copyright{} 2021 B. Wilson@* Copyright @copyright{} 2021 Xinglu Chen@* +Copyright @copyright{} 2021 Hui Lu@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -15280,6 +15281,14 @@ Font engine used in Kmscon. @item @code{font-size} (default: @code{12}) Font size used in Kmscon. +@item @code{keyboard-layout} (default: @code{#f}) +If this is @code{#f}, Kmscon uses the default keyboard layout---usually US +English (``qwerty'') for a 105-key PC keyboard. + +Otherwise this must be a @code{keyboard-layout} object specifying the keyboard +layout. @xref{Keyboard Layout}, for more information on how to specify the +keyboard layout. + @item @code{kmscon} (default: @var{kmscon}) The Kmscon package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 3be2e984c3..6922d7f90b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 qblade +;;; Copyright © 2021 Hui Lu ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,7 @@ #:use-module (gnu system shadow) ; 'user-account', etc. #:use-module (gnu system uuid) #:use-module (gnu system file-systems) ; 'file-system', etc. + #:use-module (gnu system keyboard) #:use-module (gnu system mapped-devices) #:use-module ((gnu system linux-initrd) #:select (file-system-packages)) @@ -2267,7 +2269,9 @@ notably to select, copy, and paste text. The default options use the (font-engine kmscon-configuration-font-engine (default "pango")) (font-size kmscon-configuration-font-size - (default 12))) + (default 12)) + (keyboard-layout kmscon-configuration-keyboard-layout + (default #f))) ; #f | (define kmscon-service-type (shepherd-service-type @@ -2280,7 +2284,8 @@ notably to select, copy, and paste text. The default options use the (auto-login (kmscon-configuration-auto-login config)) (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)) (font-engine (kmscon-configuration-font-engine config)) - (font-size (kmscon-configuration-font-size config))) + (font-size (kmscon-configuration-font-size config)) + (keyboard-layout (kmscon-configuration-keyboard-layout config))) (define kmscon-command #~(list @@ -2289,6 +2294,18 @@ notably to select, copy, and paste text. The default options use the "--no-switchvt" ;Prevent a switch to the virtual terminal. "--font-engine" #$font-engine "--font-size" #$(number->string font-size) + #$@(if keyboard-layout + (let* ((layout (keyboard-layout-name keyboard-layout)) + (variant (keyboard-layout-variant keyboard-layout)) + (model (keyboard-layout-model keyboard-layout)) + (options (keyboard-layout-options keyboard-layout))) + `("--xkb-layout" ,layout + ,@(if variant `("--xkb-variant" ,variant) '()) + ,@(if model `("--xkb-model" ,model) '()) + ,@(if (null? options) + '() + `("--xkb-options" ,(string-join options ","))))) + '()) #$@(if hardware-acceleration? '("--hwaccel") '()) "--login" "--" #$login-program #$@login-arguments -- 2.32.0 --lfrZAGjQXGvRdgbB-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 29 13:02:19 2021 Received: (at 47994-done) by debbugs.gnu.org; 29 Jun 2021 17:02:19 +0000 Received: from localhost ([127.0.0.1]:55214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyH7r-0002Ot-4w for submit@debbugs.gnu.org; Tue, 29 Jun 2021 13:02:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:38790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lyH7q-0002Of-Ea for 47994-done@debbugs.gnu.org; Tue, 29 Jun 2021 13:02:18 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:35438) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyH7j-0001fI-Ch; Tue, 29 Jun 2021 13:02:12 -0400 Received: from [2a01:e0a:19b:d9a0:f2f7:a404:c3d3:f8b4] (port=51500 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyH7j-0000ye-4F; Tue, 29 Jun 2021 13:02:11 -0400 From: Mathieu Othacehe To: luhui Subject: Re: bug#47994: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> <87bl8lerbe.fsf_-_@gnu.org> Date: Tue, 29 Jun 2021 19:02:09 +0200 In-Reply-To: (luhui's message of "Mon, 21 Jun 2021 23:28:34 +0800") Message-ID: <87lf6s8uzy.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47994-done Cc: 47994-done@debbugs.gnu.org, Maxime Devos 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: -3.3 (---) Hey, > Sorry, made this mistake, now I fixed it and sent a new patch. Pushed with minor edits, Thanks, Mathieu From unknown Sat Jun 21 10:38:59 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 28 Jul 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator