refactort(ayase): reconstruct swap-devices

1 files changed, 16 insertions, 12 deletions

diff --git a/systems/ayase.scm b/systems/ayase.scm
index 14ee23c..8fb8be9 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -57,6 +57,11 @@
 (define efi-filesystem-uuid
   (uuid "B4FB-CBD9" 'fat32))
 
+(define (label number)
+  (file-system-label (string-append host-name
+				    "-swap"
+				    number)))
+
 (define root-filesystem-uuid
   (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c"))
 
@@ -66,11 +71,6 @@
   (use-modules (users id1000))
   `((,uid1000-name ,(uid1000-home-environment host-name))))
 
-(define (swap-label number)
-  (file-system-label (string-append host-name
-				    "-swap"
-				    number)))
-
 (define efi-partition
   ((@ (gnu system file-systems) file-system)
    (mount-point "/boot/efi")
@@ -105,6 +105,10 @@
    (device root-filesystem-uuid)
    (type "ext4")))
 
+(define (swap-label number)
+  (let ((target-label (label number)))
+    (swap-space (target target-label))))
+
 (define system-packages-service
   (simple-service 'system-packages
 		  profile-service-type
@@ -129,6 +133,11 @@
 	  (list root-partition
 		efi-partition)))
 
+(define (locale-definitions)
+  (use-modules (gnu system locale))
+  (append %default-locale-definitions
+	  (list polish-locale)))
+
 (define polish-locale
   ((@ (gnu system locale) locale-definition)
    (name "pl_PL.utf8")
@@ -144,21 +153,16 @@
 		tor-service)))
 
 (define swap-device-1
-  (swap-space (target (swap-label "-1"))))
+  (swap-label "-1"))
 
 (define swap-device-2
-  (swap-space (target (swap-label "-2"))))
+  (swap-label "-2"))
 
 (define (users)
   (use-modules (users id1000))
   (append %base-user-accounts
 	  (list uid1000-account)))
 
-(define (locale-definitions)
-  (use-modules (gnu system locale))
-  (append %default-locale-definitions
-	  (list polish-locale)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-public operating-system*