From 4eba556e2144fecb659a2634334edde6acb9de90 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Wed, 4 Feb 2026 22:54:15 +0800 Subject: [PATCH] services: Add %rosenthal-desktop-services-gdm. * modules/rosenthal/services/desktop.scm (%rosenthal-desktop-services-gdm): Extracted from... (rosenthal-desktop-services-for-system): ...it. Adjust accordingly. --- modules/rosenthal/services/desktop.scm | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/rosenthal/services/desktop.scm b/modules/rosenthal/services/desktop.scm index bc5fe05..4594395 100644 --- a/modules/rosenthal/services/desktop.scm +++ b/modules/rosenthal/services/desktop.scm @@ -64,6 +64,7 @@ %rosenthal-set-keymap %rosenthal-skeletons + %rosenthal-desktop-services-gdm %rosenthal-desktop-services %rosenthal-desktop-home-services)) @@ -653,37 +654,8 @@ configuration { ;;; Service presets. ;;; -(define* (rosenthal-desktop-services-for-system - #: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)) - - (define %term-font - (file-append (spec->pkg "font-terminus") "/share/consolefonts/ter-132n")) - - (cons* (service greetd-service-type - (greetd-configuration - (greeter-supplementary-groups '("video" "input")) - (terminals - (map (lambda (x) - (greetd-terminal-configuration - (terminal-vt (number->string x)) - (terminal-switch (eqv? 1 x)) - (default-session-command - (cond - ((eqv? 1 x) - (greetd-tuigreet-session)) - (else - (greetd-agreety-session - (command - (greetd-user-session - (command #~(getenv "SHELL")))))))))) - (iota 6 1))))) - - (service bluetooth-service-type +(define %rosenthal-desktop-services-gdm + (cons* (service bluetooth-service-type (bluetooth-configuration (auto-enable? #t))) @@ -706,17 +678,45 @@ configuration { (simple-service 'backlight udev-service-type (specs->pkgs "light")) (modify-services %desktop-services - (delete mingetty-service-type) - (delete %display-manager-service-type) - (delete screen-locker-service-type) - ;; Use a font suitable for HiDPI monitors. (console-font-service-type _ => (map (lambda (num) (cons (string-append "tty" (number->string num)) - %term-font)) + (file-append (spec->pkg "font-terminus") + "/share/consolefonts/ter-132n"))) (iota 6 1)))))) +(define* (rosenthal-desktop-services-for-system + #: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 greetd-service-type + (greetd-configuration + (greeter-supplementary-groups '("video" "input")) + (terminals + (map (lambda (x) + (greetd-terminal-configuration + (terminal-vt (number->string x)) + (terminal-switch (eqv? 1 x)) + (default-session-command + (cond + ((eqv? 1 x) + (greetd-tuigreet-session)) + (else + (greetd-agreety-session + (command + (greetd-user-session + (command #~(getenv "SHELL")))))))))) + (iota 6 1))))) + + (modify-services %rosenthal-desktop-services-gdm + (delete mingetty-service-type) + (delete %display-manager-service-type)))) + (define-syntax %rosenthal-desktop-services (identifier-syntax (rosenthal-desktop-services-for-system)))