fix(ayase): refactor services

1 files changed, 38 insertions, 28 deletions

diff --git a/systems/ayase.scm b/systems/ayase.scm
index 35c4c7c..85142ea 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -62,6 +62,10 @@
 
 ;;;
 
+;; (alist string #<home-environment>)
+(define home-environments
+  `((,uid1000-name ,(uid1000-home-environment host-name))))
+
 ;; #<file-system-label>
 (define (swap-label number)
   (file-system-label (string-append host-name
@@ -70,63 +74,72 @@
 
 ;;;
 
-;; <swap-space>
+;; #<service>
+(define home-services
+  (service guix-home-service-type
+	   home-environments))
+
+;; #<swap-space>
 (define swap-1
   (swap-space (target (swap-label "-1"))))
 
-;; <swap-space>
+;; #<swap-space>
 (define swap-2
   (swap-space (target (swap-label "-2"))))
 
+;; (list #<service>)
+(define system-services
+  (list (service libvirt-service-type)
+	(service openssh-service-type)
+	(service tor-service-type)
+	(simple-service 'gc-workaround
+			profile-service-type
+			(list grub
+			      python-pip
+			      ruby))
+	(simple-service 'system-packages
+			profile-service-type
+			(list gnome-boxes
+			      kgpg
+			      pinentry-qt
+			      pinentry-tty))))
+
 ;;;
 
-;; (list <swap-space>)
+;; (list #<service>)
+(define services
+  (append %distribution-services
+	  (list home-services)
+	  system-services))
+
+;; (list #<swap-space>)
 (define swap-devices
   (list swap-1
 	swap-2))
 
-;; (list <user-account>)
+;; (list #<user-account>)
 (define users
   (append %base-user-accounts
 	  (list uid1000-account)))
 
 ;;;
 
-;; record* operating-system
+;; #<operating-system>
 (define-public operating-system*
   (let* ((bootloader-targets (list "/boot/efi"))
 	 (efi-filesystem-id (uuid "B4FB-CBD9" 'fat32))
-	 (home-environments `((,uid1000-name ,(uid1000-home-environment host-name))))
 	 (root-filesystem-id (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c"))
 
 	 (efi-partition (file-system (mount-point "/boot/efi")
 				     (device efi-filesystem-id)
 				     (type "vfat")))
-	 (home-services (service guix-home-service-type
-				 home-environments))
 	 (root-partition (file-system (mount-point "/")
 				      (device root-filesystem-id)
 				      (type "ext4")))
 
 	 (ayase-file-systems (list root-partition
 				   efi-partition))
-	 (home-services (list home-services))
 	 (keyboard-layout (keyboard-layout "pl"))
-	 (system-services (list (service libvirt-service-type)
-				(service openssh-service-type)
-				(service tor-service-type)
-				(simple-service 'gc-workaround
-						profile-service-type
-						(list grub
-						      python-pip
-						      ruby))
-				(simple-service 'system-packages
-						profile-service-type
-						(list gnome-boxes
-						      kgpg
-						      pinentry-qt
-						      pinentry-tty))))
-
 	 (bootloader (bootloader-configuration (bootloader grub-efi-bootloader)
 					       (targets bootloader-targets)
 					       (keyboard-layout keyboard-layout)))
@@ -137,10 +150,7 @@
 	 (packages (append %base-packages
 			   ;; %distribution-packages
 			   ;; system-packages
-			   ))
-	 (services (append %distribution-services
-			   home-services
-			   system-services)))
+			   )))
     (operating-system (kernel linux)
 		      (bootloader bootloader)
                       (keyboard-layout keyboard-layout)