diff options
| author | Zheng Junjie <zhengjunjie@iscas.ac.cn> | 2024-03-17 16:47:07 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@member.fsf.org> | 2024-03-19 18:52:16 +0800 |
| commit | 3ea55fada0593cd05c686cef2f6a59ba65933ef5 (patch) | |
| tree | 4ca02a582acd993618cfb95a31e45073b89f63e8 | |
| parent | 755838a37884b775e27e370bb9fcdc43c3b000f0 (diff) | |
| download | guix-3ea55fada0593cd05c686cef2f6a59ba65933ef5.tar.gz guix-3ea55fada0593cd05c686cef2f6a59ba65933ef5.zip | |
services: sddm: Add extension for localed-service-type.
* 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
Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
| -rw-r--r-- | gnu/services/sddm.scm | 7 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 69c737829b..48695e2806 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 @@ Relogin=" (if (sddm-configuration-relogin? config) (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 @@ xorg-configuration-extra-config xorg-configuration-server xorg-configuration-server-arguments + xorg-configuration-keyboard-layout %default-xorg-modules %default-xorg-fonts |