seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2026-03-05 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

services: Rename %rosenthal-desktop-services.

Browse Source 
* modules/rosenthal/services/desktop.scm (%rosenthal-desktop-services/base)
(%rosenthal-desktop-services/gdm, %rosenthal-desktop-services/tuigreet): New
variables.
(%rosenthal-desktop-services-gdm, %rosenthal-desktop-services): Deprecate.
This commit is contained in:
Hilton Chain 2026-02-06 20:51:34 +08:00
parent 80874b0c7b
commit e326a012d0
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/rosenthal/services/desktop.scm
View File

@ -8,6 +8,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix deprecation)
#:use-module (rosenthal utils file) #:use-module (rosenthal utils file)
#:use-module (rosenthal utils packages) #:use-module (rosenthal utils packages)
@ -73,8 +74,12 @@
%rosenthal-set-keymap %rosenthal-set-keymap
%rosenthal-skeletons %rosenthal-skeletons
%rosenthal-desktop-services-gdm %rosenthal-desktop-services/gdm
%rosenthal-desktop-services %rosenthal-desktop-services/tuigreet
%rosenthal-desktop-services-gdm ;deprecated
%rosenthal-desktop-services ;deprecated
%rosenthal-desktop-home-services)) %rosenthal-desktop-home-services))
@ -670,7 +675,15 @@ configuration {
;;; Service presets. ;;; Service presets.
;;; ;;;
(define %rosenthal-desktop-services-gdm (define* (base-rosenthal-desktop-services
#:optional (system (or (%current-target-system)
(%current-system))))
(define %display-manager-service-type
(if (string-prefix? "x86_64" system)
gdm-service-type
sddm-service-type))
(cons* (service bluetooth-service-type (cons* (service bluetooth-service-type
(bluetooth-configuration (bluetooth-configuration
(auto-enable? #t))) (auto-enable? #t)))
@ -694,6 +707,7 @@ configuration {
(simple-service 'backlight udev-service-type (list light)) (simple-service 'backlight udev-service-type (list light))
(modify-services %desktop-services (modify-services %desktop-services
(delete %display-manager-service-type)
;; Use a font suitable for HiDPI monitors. ;; Use a font suitable for HiDPI monitors.
(console-font-service-type (console-font-service-type
_ => (map (lambda (num) _ => (map (lambda (num)
@ -702,14 +716,14 @@ configuration {
"/share/consolefonts/ter-132n"))) "/share/consolefonts/ter-132n")))
(iota 6 1)))))) (iota 6 1))))))
(define* (rosenthal-desktop-services-for-system (define-syntax %rosenthal-desktop-services/base
#:optional (system (or (%current-target-system) (identifier-syntax (base-rosenthal-desktop-services)))
(%current-system))))
(define %display-manager-service-type
(if (string-prefix? "x86_64" system)
gdm-service-type
sddm-service-type))
(define %rosenthal-desktop-services/gdm
(cons* (service gdm-service-type)
%rosenthal-desktop-services/base))
(define %rosenthal-desktop-services/tuigreet
(cons* (service greetd-service-type (cons* (service greetd-service-type
(greetd-configuration (greetd-configuration
(greeter-supplementary-groups '("video" "input")) (greeter-supplementary-groups '("video" "input"))
@ -728,13 +742,11 @@ configuration {
(greetd-user-session (greetd-user-session
(command #~(getenv "SHELL")))))))))) (command #~(getenv "SHELL"))))))))))
(iota 6 1))))) (iota 6 1)))))
(modify-services %rosenthal-desktop-services/base
(delete mingetty-service-type))))
(modify-services %rosenthal-desktop-services-gdm (define-deprecated %rosenthal-desktop-services-gdm %rosenthal-desktop-services/gdm)
(delete mingetty-service-type) (define-deprecated %rosenthal-desktop-services %rosenthal-desktop-services/tuigreet)
(delete %display-manager-service-type))))
(define-syntax %rosenthal-desktop-services
(identifier-syntax (rosenthal-desktop-services-for-system)))
(define %rosenthal-desktop-home-services (define %rosenthal-desktop-home-services
(cons* (service home-shepherd-service-type (cons* (service home-shepherd-service-type