* 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 ;;; 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 base-commit: edfb05e16d409ab71f5cc5c91747b693f0054d59 prerequisite-patch-id: 5a904c413bc4e5484fed86ec8a7862b20ef3156e prerequisite-patch-id: a346e78c52eb9d8b1134cf463ce62c4050726569 -- 2.41.0