From patchwork Sat Apr 24 05:37:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: luhui X-Patchwork-Id: 28846 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 F214627BC7D; Sat, 24 Apr 2021 17:07:26 +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 83A3527BC7C for ; Sat, 24 Apr 2021 17:07:26 +0100 (BST) Received: from localhost ([::1]:52136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1laKoX-0003ia-KC for patchwork@mira.cbaines.net; Sat, 24 Apr 2021 12:07:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1laKdW-0004AI-Mz for guix-patches@gnu.org; Sat, 24 Apr 2021 11:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1laKdW-0002ik-Fj for guix-patches@gnu.org; Sat, 24 Apr 2021 11:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1laKdW-0000SL-E5 for guix-patches@gnu.org; Sat, 24 Apr 2021 11:56:02 -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: Sat, 24 Apr 2021 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47994@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16192797121668 (code B ref -1); Sat, 24 Apr 2021 15:56:02 +0000 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 Message-ID: MIME-Version: 1.0 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-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 X-Mailman-Approved-At: Sat, 24 Apr 2021 12:03:34 -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 Added xkb-layout and xkb-options fields to adjust the keyboard layout of kmscon 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