refactor(izumi): isolate (desktop-services-izumi)

1 files changed, 54 insertions, 53 deletions

diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index 4bca3ae..5ccad25 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -129,6 +129,45 @@
                (path "/srv/git/marek/packages"))))
             (repository-directory "/var/lib/gitolite/repositories"))))
 
+(define (desktop-services-izumi)
+  (modify-services
+   %desktop-services
+   (elogind-service-type
+    configuration =>
+    (elogind-configuration
+     (inherit configuration)
+     (handle-lid-switch 'ignore)
+     (handle-lid-switch-docked 'ignore)
+     (handle-lid-switch-external-power 'ignore)))
+   (gdm-service-type
+    configuration =>
+    (gdm-configuration
+     (inherit configuration)
+     (auto-suspend? #f)
+     (wayland? #t)))
+   (guix-service-type
+    configuration =>
+    (let*
+        ((non-guix.pub
+          (string-append
+           "( public-key ( ecc ( curve Ed25519 )"
+           "( q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98# ) ) )"))
+         (authorized-keys
+          (append
+           %default-authorized-guix-keys
+           (list (plain-file "non-guix.pub" non-guix.pub))))
+         (extra-options
+          (list "--gc-keep-derivations=yes" "--gc-keep-outputs=yes"))
+         (substitute-urls
+          (append
+           %default-substitute-urls
+           (list "https://substitutes.nonguix.org"))))
+      (guix-configuration
+       (inherit configuration)
+       (authorized-keys authorized-keys)
+       (extra-options extra-options)
+       (substitute-urls substitute-urls))))))
+
 (define (etc-mailname)
   (simple-service 'etc-files
                   etc-service-type
@@ -407,59 +446,21 @@
   "izumi")
 
 (define services-izumi
-  (append
-   ( modify-services
-     %desktop-services
-     ( elogind-service-type
-       configuration =>
-       ( elogind-configuration
-         ( inherit configuration )
-         ( handle-lid-switch 'ignore )
-         ( handle-lid-switch-docked 'ignore )
-         ( handle-lid-switch-external-power 'ignore ) ) )
-     ( gdm-service-type
-       configuration =>
-       ( gdm-configuration
-         ( inherit configuration )
-         ( auto-suspend? #f )
-         ( wayland? #t ) ) )
-     ( guix-service-type
-       configuration =>
-       ( let*
-           ( ( non-guix.pub
-               ( string-append
-                 "( public-key ( ecc ( curve Ed25519 )"
-                 "( q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98# ) ) )" ) )
-             ( authorized-keys
-               ( append
-                 %default-authorized-guix-keys
-                 ( list ( plain-file "non-guix.pub" non-guix.pub ) ) ) )
-             ( extra-options
-               ( list "--gc-keep-derivations=yes" "--gc-keep-outputs=yes" ) )
-             ( substitute-urls
-               ( append
-                 %default-substitute-urls
-                 ( list "https://substitutes.nonguix.org" ) ) ) )
-         ( guix-configuration
-           ( inherit configuration )
-           ( authorized-keys authorized-keys )
-           ( extra-options extra-options )
-           ( substitute-urls substitute-urls ) ) ) ) )
-   ( list
-     (@ (users id1000) dkim-service)
-     (@ (users id1000) dovecot-service)
-     (@ (users id1000) smtp-service)
-     (certbot)
-     cgit
-     (etc-mailname)
-     (fcgiwrap)
-     (gitolite)
-     (home-services)
-     (nginx)
-     (openssh)
-     (plasma-desktop)
-     (radicale)
-     (syncthing))))
+  (append (desktop-services-izumi)
+          (list (@ (users id1000) dkim-service)
+                (@ (users id1000) dovecot-service)
+                (@ (users id1000) smtp-service)
+                (certbot)
+                cgit
+                (etc-mailname)
+                (fcgiwrap)
+                (gitolite)
+                (home-services)
+                (nginx)
+                (openssh)
+                (plasma-desktop)
+                (radicale)
+                (syncthing))))
 
 (define swap-device-izumi-1
   (swap-space (target swap-device-izumi-1-label)))