From patchwork Sun Apr 25 10:04:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: luhui X-Patchwork-Id: 28874 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 AA8C527BC7D; Sun, 25 Apr 2021 15:03:30 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID 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 38F5E27BC7C for ; Sun, 25 Apr 2021 15:03:30 +0100 (BST) Received: from localhost ([::1]:47140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lafM9-0002ep-CY for patchwork@mira.cbaines.net; Sun, 25 Apr 2021 10:03:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1labdO-00034S-Cn for guix-patches@gnu.org; Sun, 25 Apr 2021 06:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1labdO-0008Qf-5X for guix-patches@gnu.org; Sun, 25 Apr 2021 06:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1labdN-0003Yg-Vg for guix-patches@gnu.org; Sun, 25 Apr 2021 06:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47994] [PATCH] services: kmscon: Add xkb-layout and xkb-options fields. Resent-From: luhui Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 25 Apr 2021 10:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 47994@debbugs.gnu.org, luhui Received: via spool by 47994-submit@debbugs.gnu.org id=B47994.161934508113648 (code B ref 47994); Sun, 25 Apr 2021 10:05:01 +0000 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 Message-ID: References: <328fbd240891f63e52020fa59341c8fbf1f3bb42.camel@telenet.be> MIME-Version: 1.0 Content-Disposition: inline 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 25 Apr 2021 10:03:03 -0400 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 ok, new patch: 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