refactor(akashi): reconstruct services

1 files changed, 16 insertions, 12 deletions

diff --git a/systems/akashi.scm b/systems/akashi.scm
index 0b14704..cffb5a5 100644
--- a/systems/akashi.scm
+++ b/systems/akashi.scm
@@ -11,6 +11,19 @@
 		 (mount-point "/")
 		 (device "akashi-root")))))
 
+(define (services)
+  (use-modules (suweren system))
+  (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
+
+	 (guix-home ((@ (gnu services) service)
+		     guix-home-service-type
+		     home-environments)))
+    (append %suweren-services
+	    (list guix-home
+		  ((@ (gnu services base) udev-rules-service)
+		   'adb-udev
+		   (@ (gnu packages android) android-udev-rules))))))
+
 (define (users)
   (use-modules (users id1000))
   (list uid1000-account))
@@ -22,18 +35,8 @@
 	       (machines thinkpad-x200)
 	       (suweren system)
 	       (users id1000))
-  (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
-
-	 (guix-home ((@ (gnu services) service)
-		     guix-home-service-type
-		     home-environments))
-
-	 (keyboard-layout ((@ (gnu system keyboard) keyboard-layout)
+  (let* ((keyboard-layout ((@ (gnu system keyboard) keyboard-layout)
 			   "pl"))
-	 (services* (list guix-home
-			  ((@ (gnu services base) udev-rules-service)
-			   'adb-udev
-			   (@ (gnu packages android) android-udev-rules))))
 	 (timezone* "Europe/Warsaw"))
     ((@ (gnu system) operating-system)
      (inherit (suweren-operating-system))
@@ -46,7 +49,8 @@
      (file-systems (file-systems))
      (swap-devices (swap-devices* host-name*))
      (users (users))
-     (timezone timezone*))))
+     (timezone timezone*)
+     (services (services)))))
 
 (define-public operating-system*
   (operating-system*))