[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/30: services: sddm: Add extension for localed-service-type.
From: |
guix-commits |
Subject: |
13/30: services: sddm: Add extension for localed-service-type. |
Date: |
Tue, 19 Mar 2024 07:12:07 -0400 (EDT) |
iyzsong pushed a commit to branch master
in repository guix.
commit 3ea55fada0593cd05c686cef2f6a59ba65933ef5
Author: Zheng Junjie <zhengjunjie@iscas.ac.cn>
AuthorDate: Sun Mar 17 16:47:07 2024 +0800
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>
---
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..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
- 11/30: gnu: spdlog: Fix cross-compilation., (continued)
- 11/30: gnu: spdlog: Fix cross-compilation., guix-commits, 2024/03/19
- 15/30: gnu: a2jmidid: Fix build for riscv64-linux., guix-commits, 2024/03/19
- 17/30: gnu: xfce4-pulseaudio-plugin: Update to 0.4.8., guix-commits, 2024/03/19
- 18/30: gnu: thunar-archive-plugin: Update to 0.5.2., guix-commits, 2024/03/19
- 24/30: gnu: xfce4-notifyd: Update to 0.9.4., guix-commits, 2024/03/19
- 27/30: gnu: xfce4-screensaver: Update to 4.18.3., guix-commits, 2024/03/19
- 28/30: gnu: xfce4-genmon-plugin: Update to 4.2.0., guix-commits, 2024/03/19
- 03/30: gnu: quickjs: Use G-expressions., guix-commits, 2024/03/19
- 07/30: gnu: sxhkd: Remove asciidoc from inputs., guix-commits, 2024/03/19
- 09/30: gnu: bspwm: Fix cross-compilation., guix-commits, 2024/03/19
- 13/30: services: sddm: Add extension for localed-service-type.,
guix-commits <=
- 16/30: gnu: xfce4-clipman-plugin: Update to 1.6.6., guix-commits, 2024/03/19
- 23/30: gnu: xfce4-taskmanager: Update to 1.5.7., guix-commits, 2024/03/19
- 30/30: gnu: xfce4-cpugraph-plugin: Update to 1.2.10., guix-commits, 2024/03/19
- 26/30: gnu: xfce4-screenshooter: Update to 1.10.5., guix-commits, 2024/03/19