refactor(ayase): break up file-systems

1 files changed, 27 insertions, 17 deletions

diff --git a/systems/ayase.scm b/systems/ayase.scm
index 5e39a01..d7a2524 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -54,6 +54,12 @@
 (define host-name
   "ayase")
 
+(define efi-filesystem-uuid
+  (uuid "B4FB-CBD9" 'fat32))
+
+(define root-filesystem-uuid
+  (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c"))
+
 ;;;
 
 (define (home-environments)
@@ -65,10 +71,22 @@
 				    "-swap"
 				    number)))
 
+(define efi-partition
+  ((@ (gnu system file-systems) file-system)
+   (mount-point "/boot/efi")
+   (device efi-filesystem-uuid)
+   (type "vfat")))
+
 (define home-services
   (service guix-home-service-type
 	   (home-environments)))
 
+(define root-partition
+  ((@ (gnu system file-systems) file-system)
+   (mount-point "/")
+   (device root-filesystem-uuid)
+   (type "ext4")))
+
 ;; #<swap-space>
 (define swap-1
   (swap-space (target (swap-label "-1"))))
@@ -95,6 +113,12 @@
 
 ;;;
 
+(define (file-systems)
+  (use-modules (gnu system file-systems))
+  (append %base-file-systems
+	  (list root-partition
+		efi-partition)))
+
 (define polish-locale
   ((@ (gnu system locale) locale-definition)
    (name "pl_PL.utf8")
@@ -126,32 +150,18 @@
 ;; #<operating-system>
 (define-public operating-system*
   (let* ((bootloader-targets (list "/boot/efi"))
-	 (efi-filesystem-id (uuid "B4FB-CBD9" 'fat32))
-	 (root-filesystem-id (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c"))
-
-	 (efi-partition (file-system (mount-point "/boot/efi")
-				     (device efi-filesystem-id)
-				     (type "vfat")))
-	 (root-partition (file-system (mount-point "/")
-				      (device root-filesystem-id)
-				      (type "ext4")))
-
-	 (ayase-file-systems (list root-partition
-				   efi-partition))
+
 	 (keyboard-layout (keyboard-layout "pl"))
 	 (bootloader (bootloader-configuration (bootloader grub-efi-bootloader)
 					       (targets bootloader-targets)
-					       (keyboard-layout keyboard-layout)))
-	 (file-systems (append %base-file-systems
-			       ;; %distribution-file-systems
-			       ayase-file-systems)))
+					       (keyboard-layout keyboard-layout))))
     (operating-system (kernel linux)
 		      (bootloader bootloader)
                       (keyboard-layout keyboard-layout)
 		      (initrd microcode-initrd)
 		      (firmware (list linux-firmware))
                       (host-name host-name)
-                      (file-systems file-systems)
+                      (file-systems (file-systems))
                       (swap-devices swap-devices)
                       (users (users))
                       (timezone "Europe/Warsaw")