From: Zheng Junjie <zhengjunjie@iscas.ac.cn>
To: 69839@debbugs.gnu.org
Subject: [bug#69839] [PATCH] services: sddm: add extension for localed-service-type.
Date: Sun, 17 Mar 2024 16:47:07 +0800 [thread overview]
Message-ID: <6514eae8c10c1c810e40ac358f87ce5fb936c1c1.1710665227.git.zhengjunjie@iscas.ac.cn> (raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 2572 bytes --]
* 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(-)
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 <ludo@gnu.org>
;;; Copyright © 2019 Jesse Gildersleve <jessejohngildersleve@protonmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; 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 <cmmarusich@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 muradm <mail@muradm.net>
+;;; 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
base-commit: edfb05e16d409ab71f5cc5c91747b693f0054d59
prerequisite-patch-id: 5a904c413bc4e5484fed86ec8a7862b20ef3156e
prerequisite-patch-id: a346e78c52eb9d8b1134cf463ce62c4050726569
--
2.41.0
next reply other threads:[~2024-03-17 8:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-17 8:47 Zheng Junjie [this message]
2024-03-19 11:20 ` bug#69839: [PATCH] services: sddm: add extension for localed-service-type 宋文武 via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6514eae8c10c1c810e40ac358f87ce5fb936c1c1.1710665227.git.zhengjunjie@iscas.ac.cn \
--to=zhengjunjie@iscas.ac.cn \
--cc=69839@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).