modules/rosenthal/services/desktop.scm

@@ -8,7 +8,6 @@
   #:use-module (guix packages)
   #:use-module (guix records)
   #:use-module (guix utils)
-  #:use-module (guix deprecation)
   #:use-module (rosenthal utils file)
   #:use-module (rosenthal utils packages)
 
@@ -21,7 +20,6 @@
   #:use-module (gnu services base)
   #:use-module (gnu services configuration)
   #:use-module (gnu services desktop)
-  #:use-module (gnu services pm)
   #:use-module (gnu services sddm)
   #:use-module (gnu services xorg)
   #:use-module (rosenthal services base)
@@ -58,7 +56,6 @@
             home-niri-configuration
             home-niri-service-type
 
-            home-noctalia-shell-configuration
             home-noctalia-shell-service-type
 
             home-rofi-configuration
@@ -75,12 +72,8 @@
 
             %rosenthal-set-keymap
             %rosenthal-skeletons
-            %rosenthal-desktop-services/gdm
-            %rosenthal-desktop-services/tuigreet
-
-            %rosenthal-desktop-services-gdm ;deprecated
-            %rosenthal-desktop-services     ;deprecated
-
+            %rosenthal-desktop-services-gdm
+            %rosenthal-desktop-services
             %rosenthal-desktop-home-services))
 
 
@@ -307,31 +300,24 @@ compositor.")))
 ;;; Noctalia
 ;;;
 
-(define-configuration/no-serialization home-noctalia-shell-configuration
-  (noctalia-shell
-   (file-like noctalia-shell)
-   "File-like object to provide @command{/bin/noctalia-shell}."))
-
 (define %home-noctalia-shell-shepherd
-  (match-record-lambda <home-noctalia-shell-configuration>
-      (noctalia-shell)
   (list (shepherd-service
           (documentation "Start noctalia-shell.")
           (provision '(noctalia-shell))
           (start
            #~(make-forkexec-constructor
               (list #$(file-append noctalia-shell "/bin/noctalia-shell"))))
-            (stop #~(make-kill-destructor))))))
+          (stop #~(make-kill-destructor)))))
 
 (define home-noctalia-shell-service-type
   (service-type
     (name 'noctalia-shell)
     (extensions
      (list (service-extension home-shepherd-service-type
-                              %home-noctalia-shell-shepherd)
+                              (const %home-noctalia-shell-shepherd))
            (service-extension home-profile-service-type
-                              (compose list home-noctalia-shell-configuration-noctalia-shell))))
-    (default-value (home-noctalia-shell-configuration))
+                              (const (list noctalia-shell)))))
+    (default-value #f)
     (description "")))
 
 
@@ -676,23 +662,13 @@ configuration {
 ;;; Service presets.
 ;;;
 
-(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))
-
+(define %rosenthal-desktop-services-gdm
   (cons* (service bluetooth-service-type
            (bluetooth-configuration
              (auto-enable? #t)))
 
          (service gvfs-service-type)
 
-         (service power-profiles-daemon-service-type)
-
          ;; Screen lockers for Wayland environment.  No dependencies are pulled
          ;; in since we're using empty files.
          (service screen-locker-service-type
@@ -710,7 +686,6 @@ configuration {
          (simple-service 'backlight udev-service-type (list light))
 
          (modify-services %desktop-services
-           (delete %display-manager-service-type)
            ;; Use a font suitable for HiDPI monitors.
            (console-font-service-type
             _ => (map (lambda (num)
@@ -719,14 +694,14 @@ configuration {
                                            "/share/consolefonts/ter-132n")))
                       (iota 6 1))))))
 
-(define-syntax %rosenthal-desktop-services/base
-  (identifier-syntax (base-rosenthal-desktop-services)))
+(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 %rosenthal-desktop-services/gdm
-  (cons* (service gdm-service-type)
-         %rosenthal-desktop-services/base))
-
-(define %rosenthal-desktop-services/tuigreet
   (cons* (service greetd-service-type
            (greetd-configuration
              (greeter-supplementary-groups '("video" "input"))
@@ -745,11 +720,13 @@ configuration {
                               (greetd-user-session
                                 (command #~(getenv "SHELL"))))))))))
                    (iota 6 1)))))
-         (modify-services %rosenthal-desktop-services/base
-           (delete mingetty-service-type))))
 
-(define-deprecated %rosenthal-desktop-services-gdm %rosenthal-desktop-services/gdm)
-(define-deprecated %rosenthal-desktop-services %rosenthal-desktop-services/tuigreet)
+         (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)))
 
 (define %rosenthal-desktop-home-services
   (cons* (service home-shepherd-service-type