GNU bug report logs - #47994
[PATCH] services: kmscon: Add xkb-layout and xkb-options fields.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: luhui <luhuins@HIDDEN>; Keywords: patch; dated Sat, 24 Apr 2021 15:56:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 47994 <at> debbugs.gnu.org:


Received: (at 47994) by debbugs.gnu.org; 26 Apr 2021 19:23:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 26 15:23:35 2021
Received: from localhost ([127.0.0.1]:47221 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1lb6pT-00082W-HP
	for submit <at> 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 <maximedevos@HIDDEN>) id 1lb6pQ-00082M-VQ
 for 47994 <at> 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: <e11c877f6c82305d3b69305e6e19f8753ac6517a.camel@HIDDEN>
Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and
 xkb-options fields.
From: Maxime Devos <maximedevos@HIDDEN>
To: luhui <luhuins@HIDDEN>
Date: Mon, 26 Apr 2021 21:23:00 +0200
In-Reply-To: <YIYgR5cxD9NQWq46@thinkpad-x230-luhui>
References: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
 <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@HIDDEN>
 <YIU+rmMowFm3Gqrw@thinkpad-x230-luhui>
 <ef083366e5e92fba2d42a09c3e035f337a38a97e.camel@HIDDEN>
 <YIYgR5cxD9NQWq46@thinkpad-x230-luhui>
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 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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--





Information forwarded to guix-patches@HIDDEN:
bug#47994; Package guix-patches. Full text available.

Message received at 47994 <at> debbugs.gnu.org:


Received: (at 47994) by debbugs.gnu.org; 26 Apr 2021 02:07:28 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 25 22:07:28 2021
Received: from localhost ([127.0.0.1]:44091 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1laqel-0008Q0-R8
	for submit <at> 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 <luhuins@HIDDEN>) id 1laqei-0008Pl-F7
 for 47994 <at> 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 <luhuins@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and
 xkb-options fields.
Message-ID: <YIYgR5cxD9NQWq46@thinkpad-x230-luhui>
References: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
 <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@HIDDEN>
 <YIU+rmMowFm3Gqrw@thinkpad-x230-luhui>
 <ef083366e5e92fba2d42a09c3e035f337a38a97e.camel@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="NUNBHy/ESFyMFLW9"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <ef083366e5e92fba2d42a09c3e035f337a38a97e.camel@HIDDEN>
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 <at> debbugs.gnu.org, luhui <luhuins@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <luhuins@HIDDEN>
Date: Sat, 24 Apr 2021 10:56:03 +0800
Subject: [PATCH] services: kmscon: Add keyboard-layout fields.

* gnu/services/base.scm (<kmscon-configuration>): 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 <pelzflorian@HIDDEN>
 ;;; Copyright  2020 Brice Waegeneire <brice@HIDDEN>
 ;;; Copyright  2021 qblade <qblade@HIDDEN>
+;;; Copyright  2021 luhui <luhuins@HIDDEN>
 ;;;
 ;;; 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 | <keyboard-layout>
 
 (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--





Information forwarded to guix-patches@HIDDEN:
bug#47994; Package guix-patches. Full text available.

Message received at 47994 <at> debbugs.gnu.org:


Received: (at 47994) by debbugs.gnu.org; 25 Apr 2021 12:46:38 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 25 08:46:38 2021
Received: from localhost ([127.0.0.1]:42207 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1lae9m-0005gO-A2
	for submit <at> 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 <maximedevos@HIDDEN>) id 1lae9j-0005gE-IL
 for 47994 <at> 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: <ef083366e5e92fba2d42a09c3e035f337a38a97e.camel@HIDDEN>
Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and
 xkb-options fields.
From: Maxime Devos <maximedevos@HIDDEN>
To: luhui <luhuins@HIDDEN>
Date: Sun, 25 Apr 2021 14:46:25 +0200
In-Reply-To: <YIU+rmMowFm3Gqrw@thinkpad-x230-luhui>
References: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
 <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@HIDDEN>
 <YIU+rmMowFm3Gqrw@thinkpad-x230-luhui>
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 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 (<https://guix.gnu.org/m=
anual/en/html_node/Keyboard-Layout.html#Keyboard-Layout>)
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--





Information forwarded to guix-patches@HIDDEN:
bug#47994; Package guix-patches. Full text available.

Message received at 47994 <at> debbugs.gnu.org:


Received: (at 47994) by debbugs.gnu.org; 25 Apr 2021 10:04:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 25 06:04:41 2021
Received: from localhost ([127.0.0.1]:42033 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1labd3-0003Y4-2q
	for submit <at> 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 <luhuins@HIDDEN>) id 1labcy-0003Xr-Ua
 for 47994 <at> 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 <luhuins@HIDDEN>
To: Maxime Devos <maximedevos@HIDDEN>
Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and
 xkb-options fields.
Message-ID: <YIU+rmMowFm3Gqrw@thinkpad-x230-luhui>
References: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
 <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="FYK+08Q2PiYqzPtP"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@HIDDEN>
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 <at> debbugs.gnu.org, luhui <luhuins@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <luhuins@HIDDEN>
Date: Sat, 24 Apr 2021 10:56:03 +0800
Subject: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields.

* gnu/services/base.scm (<kmscon-configuration>): 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 <pelzflorian@HIDDEN>
 ;;; Copyright  2020 Brice Waegeneire <brice@HIDDEN>
 ;;; Copyright  2021 qblade <qblade@HIDDEN>
+;;; Copyright  2021 luhui <luhuins@HIDDEN>
 ;;;
 ;;; 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--





Information forwarded to guix-patches@HIDDEN:
bug#47994; Package guix-patches. Full text available.

Message received at 47994 <at> debbugs.gnu.org:


Received: (at 47994) by debbugs.gnu.org; 25 Apr 2021 09:12:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 25 05:12:40 2021
Received: from localhost ([127.0.0.1]:41997 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1laaoh-0002FI-PY
	for submit <at> 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 <maximedevos@HIDDEN>) id 1laaof-0002F9-Bz
 for 47994 <at> 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@HIDDEN>
Subject: Re: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and
 xkb-options fields.
From: Maxime Devos <maximedevos@HIDDEN>
To: luhui <luhuins@HIDDEN>, 47994 <at> debbugs.gnu.org
Date: Sun, 25 Apr 2021 11:12:10 +0200
In-Reply-To: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
References: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <luhuins@HIDDEN>

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 <mail@HIDDEN>

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--





Information forwarded to guix-patches@HIDDEN:
bug#47994; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 24 Apr 2021 15:55:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 24 11:55:12 2021
Received: from localhost ([127.0.0.1]:41322 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1laKcg-0000Qm-Km
	for submit <at> 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 <luhuins@HIDDEN>) id 1laBDv-0004DR-OL
 for submit <at> 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 <luhuins@HIDDEN>) id 1laBDv-0005A6-G7
 for guix-patches@HIDDEN; 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 <luhuins@HIDDEN>) id 1laBDp-0003fT-6U
 for guix-patches@HIDDEN; 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 <luhuins@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields.
Message-ID: <YIOulQzN9Rs12Kk7@thinkpad-x230-luhui>
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@HIDDEN;
 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 <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
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 <luhuins@HIDDEN>
Date: Sat, 24 Apr 2021 10:56:03 +0800
Subject: [PATCH] services: kmscon: Add xkb-layout and xkb-options fields.

* gnu/services/base.scm (<kmscon-configuration>): Add xkb-layout and
xkb-options fields.
* doc/guix.texi (Base Services): Document them.

Signed-off-by: luhui <luhuins@HIDDEN>
---
 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--





Acknowledgement sent to luhui <luhuins@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#47994; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Mon, 26 Apr 2021 19:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.