modules/rosenthal/services/desktop.scm

@@ -81,7 +81,6 @@
 
             %rosenthal-skeletons
             %rosenthal-skeletons-installer
-            %rosenthal-desktop-services/base
             %rosenthal-desktop-services/gdm
             %rosenthal-desktop-services/tuigreet
 

modules/rosenthal/services/file-systems.scm

@@ -107,34 +107,16 @@
 ;;;
 
 (define-configuration/no-serialization zfs-configuration
-  (zfs
-   (file-like zfs)
-   "ZFS package to use.")
-  (kernel-has-zfs-module?
-   (boolean #f)
-   "Whether or not ZFS modules have already been built into the kernel.")
   (volumes?
    (boolean #f)
-   "Wait for ZFS volumes.")
+   "")
   (auto-mount?
    (boolean #t)
-   "Mount all available ZFS file systems."))
+   ""))
 
-(define zfs-linux-loadable-module-service
+(define zfs-shepherd
   (match-record-lambda <zfs-configuration>
-      (zfs kernel-has-zfs-module?)
-    (if kernel-has-zfs-module?
-        '()
-        (list `(,zfs "module")))))
-
-(define add-zfs-package
-  (match-record-lambda <zfs-configuration>
-      (zfs)
-    (list zfs)))
-
-(define zfs-shepherd-service
-  (match-record-lambda <zfs-configuration>
-      (zfs volumes? auto-mount?)
+      (volumes? auto-mount?)
     (append
      (list
       (shepherd-service
@@ -186,16 +168,16 @@
     (name 'zfs)
     (extensions
      (list (service-extension linux-loadable-module-service-type
-                              zfs-linux-loadable-module-service)
+                              (const (list `(,zfs "module"))))
            (service-extension udev-service-type
-                              add-zfs-package)
+                              (const (list zfs)))
            (service-extension kernel-module-loader-service-type
                               (const '("zfs")))
            (service-extension shepherd-root-service-type
-                              zfs-shepherd-service)
+                              zfs-shepherd)
            (service-extension user-processes-service-type
                               (const '(file-system-zfs)))
            (service-extension profile-service-type
-                              add-zfs-package)))
+                              (const (list zfs)))))
     (default-value (zfs-configuration))
     (description "")))