refactor(izumi): isolate (file-systems-izumi)

1 files changed, 24 insertions, 19 deletions

diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index b4265d3..e1c1f8b 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -73,6 +73,28 @@
 
 ;;;???????????????????????????????????????????????????????????????????
 
+(define (mapped-devices-izumi)
+  (use-modules (gnu system mapped-devices))
+  (list (mapped-device (source "/dev/sda2")
+                       (target "izumi")
+                       (type luks-device-mapping))))
+
+(define mapped-devices-izumi
+  (mapped-devices-izumi))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(define (file-systems-izumi)
+  (use-modules (gnu system file-systems))
+  (append %base-file-systems
+          (list (file-system (device "/dev/sda1")
+                             (mount-point "/boot/efi")
+                             (type "vfat"))
+                (file-system (dependencies mapped-devices-izumi)
+                             (device "/dev/mapper/izumi")
+                             (mount-point "/")
+                             (type "xfs")))))
+
 (define groups-izumi
   (append %base-groups
           (list
@@ -446,30 +468,13 @@
        ( bootloader grub-efi-bootloader )
        ( keyboard-layout keyboard-layout-izumi )
        ( targets ( list "/boot/efi" ) ) ) )
-   ( mapped-devices
-     ( list
-       ( mapped-device
-         ( source "/dev/sda2" )
-         ( target "izumi" )
-         ( type luks-device-mapping ) ) ) )
-   ( file-systems
-     ( append
-       %base-file-systems
-       ( list
-         ( file-system
-           ( device "/dev/sda1" )
-           ( mount-point "/boot/efi" )
-           ( type "vfat" ) )
-         ( file-system
-           ( dependencies mapped-devices )
-           ( device "/dev/mapper/izumi" )
-           ( mount-point "/" )
-           ( type "xfs" ) ) ) ) )
    (kernel linux)
    (keyboard-layout keyboard-layout-izumi)
    (initrd microcode-initrd)
    (firmware (list linux-firmware))
    (host-name host-name-izumi)
+   (mapped-devices mapped-devices-izumi)
+   (file-systems (file-systems-izumi))
    (swap-devices (list swap-device-izumi-1))
    (users (users-izumi))
    (groups groups-izumi)