refactor(ayase): restructure services

1 files changed, 31 insertions, 19 deletions

diff --git a/systems/ayase.scm b/systems/ayase.scm
index d00b5b8..14ee23c 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -77,6 +77,15 @@
    (device efi-filesystem-uuid)
    (type "vfat")))
 
+(define (gc-workaround-service)
+  (use-modules (gnu packages ibus))
+  (simple-service 'gc-workaround
+		  profile-service-type
+		  (list grub
+			ibus
+			python-pip
+			ruby)))
+
 (define home-services
   (service guix-home-service-type
 	   (home-environments)))
@@ -84,29 +93,28 @@
 (define keyboard-layout
   (keyboard-layout "pl"))
 
+(define libvirt-service
+  (service libvirt-service-type))
+
+(define openssh-service
+  (service openssh-service-type))
+
 (define root-partition
   ((@ (gnu system file-systems) file-system)
    (mount-point "/")
    (device root-filesystem-uuid)
    (type "ext4")))
 
-(define (system-services)
-  (use-modules (gnu packages ibus))
-  (list (service libvirt-service-type)
-	(service openssh-service-type)
-	(service tor-service-type)
-	(simple-service 'gc-workaround
-			profile-service-type
-			(list grub
-			      ibus
-			      python-pip
-			      ruby))
-	(simple-service 'system-packages
-			profile-service-type
-			(list gnome-boxes
-			      kgpg
-			      pinentry-qt
-			      pinentry-tty))))
+(define system-packages-service
+  (simple-service 'system-packages
+		  profile-service-type
+		  (list gnome-boxes
+			kgpg
+			pinentry-qt
+			pinentry-tty)))
+
+(define tor-service
+  (service tor-service-type))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -128,8 +136,12 @@
 
 (define services
   (append %distribution-services
-	  (list home-services)
-	  (system-services)))
+	  (list (gc-workaround-service)
+		home-services
+		libvirt-service
+		openssh-service
+		system-packages-service
+		tor-service)))
 
 (define swap-device-1
   (swap-space (target (swap-label "-1"))))