From patchwork Sun Mar 17 08:47:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 61883 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 5FF3927BBEC; Sun, 17 Mar 2024 08:48:54 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5D5FF27BBEA for ; Sun, 17 Mar 2024 08:48:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rlmBv-0001dO-Na; Sun, 17 Mar 2024 04:48:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlmBt-0001bm-6u for guix-patches@gnu.org; Sun, 17 Mar 2024 04:48:25 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rlmBs-0001Fy-Uz for guix-patches@gnu.org; Sun, 17 Mar 2024 04:48:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rlmCT-00054B-TZ for guix-patches@gnu.org; Sun, 17 Mar 2024 04:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69839] [PATCH] services: sddm: add extension for localed-service-type. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Mar 2024 08:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69839 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69839@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171066529819206 (code B ref -1); Sun, 17 Mar 2024 08:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Mar 2024 08:48:18 +0000 Received: from localhost ([127.0.0.1]:57630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlmBl-0004zh-HL for submit@debbugs.gnu.org; Sun, 17 Mar 2024 04:48:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:59364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rlmBj-0004zZ-IH for submit@debbugs.gnu.org; Sun, 17 Mar 2024 04:48:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rlmB7-0001Xo-Oc for guix-patches@gnu.org; Sun, 17 Mar 2024 04:47:37 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rlmB3-0001D7-N6 for guix-patches@gnu.org; Sun, 17 Mar 2024 04:47:37 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-01 (Coremail) with SMTP id qwCowAAXHakOrvZlU0bcBg--.15927S2; Sun, 17 Mar 2024 16:47:11 +0800 (CST) From: Zheng Junjie Date: Sun, 17 Mar 2024 16:47:07 +0800 Message-ID: <6514eae8c10c1c810e40ac358f87ce5fb936c1c1.1710665227.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: qwCowAAXHakOrvZlU0bcBg--.15927S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/sddm.scm(sddm-service-type): add extension for localed-service-type. * gnu/services/xorg.scm(xorg-configuration-keyboard-layout): export it. Change-Id: I26e6475b733d69f1baf00786e302a3ec6d3c4a74 --- gnu/services/sddm.scm | 7 ++++++- gnu/services/xorg.scm | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) base-commit: edfb05e16d409ab71f5cc5c91747b693f0054d59 prerequisite-patch-id: 5a904c413bc4e5484fed86ec8a7862b20ef3156e prerequisite-patch-id: a346e78c52eb9d8b1134cf463ce62c4050726569 diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 69c737829b..bbe507d0b6 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2019 Jesse Gildersleve ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -328,7 +329,11 @@ (define sddm-service-type (service-extension account-service-type (const %sddm-accounts)) (service-extension profile-service-type - sddm-profile-service))) + sddm-profile-service) + (service-extension localed-service-type + (compose + xorg-configuration-keyboard-layout + sddm-configuration-xorg)))) (default-value (sddm-configuration)) (description "Run SDDM, a display and log-in manager for X11 and diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 1ee15ea90c..b86e2d3c5b 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2022 Chris Marusich ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2023 muradm +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +78,7 @@ (define-module (gnu services xorg) xorg-configuration-extra-config xorg-configuration-server xorg-configuration-server-arguments + xorg-configuration-keyboard-layout %default-xorg-modules %default-xorg-fonts