refactor(akashi): transfer file-systems to system

2 files changed, 13 insertions, 16 deletions

diff --git a/machines/thinkpad-x200.scm b/machines/thinkpad-x200.scm
index faca5b0..3e32fc0 100644
--- a/machines/thinkpad-x200.scm
+++ b/machines/thinkpad-x200.scm
@@ -25,18 +25,6 @@
 			      (targets bootloader-targets)
 			      (keyboard-layout keyboard-layout*))))
 
-;; string ->
-;; (list record* file-system)
-(define-public (file-systems* host-name*)
-  (let* ((root-device-string (string-append host-name* "-root"))
-
-	 (root-device (file-system-label root-device-string))
-
-	 (file-system-root (file-system (type "ext4")
-					(mount-point "/")
-					(device root-device))))
-    (list file-system-root)))
-
 ;; (list record* package)
 (define-public firmware*
   (list linux-firmware))
diff --git a/systems/akashi.scm b/systems/akashi.scm
index 03bc869..0b14704 100644
--- a/systems/akashi.scm
+++ b/systems/akashi.scm
@@ -3,10 +3,20 @@
 (define host-name*
   "akashi")
 
+(define (file-systems)
+  (use-modules (suweren system))
+  (append %suweren-file-systems
+	  (list ((@ (gnu system file-systems) file-system)
+		 (type "ext4")
+		 (mount-point "/")
+		 (device "akashi-root")))))
+
 (define (users)
   (use-modules (users id1000))
   (list uid1000-account))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (define (operating-system*)
   (use-modules (gnu services guix)
 	       (machines thinkpad-x200)
@@ -26,18 +36,17 @@
 			   (@ (gnu packages android) android-udev-rules))))
 	 (timezone* "Europe/Warsaw"))
     ((@ (gnu system) operating-system)
-     (inherit %suweren-operating-system)
+     (inherit (suweren-operating-system))
      (kernel kernel*)
      (bootloader (bootloader-configuration* keyboard-layout))
      (keyboard-layout keyboard-layout)
      (initrd initrd*)
      (firmware firmware*)
      (host-name host-name*)
-     (file-systems ((@ (machines thinkpad-x200) file-systems*) host-name*))
+     (file-systems (file-systems))
      (swap-devices (swap-devices* host-name*))
      (users (users))
-     (timezone timezone*)
-     (services services*))))
+     (timezone timezone*))))
 
 (define-public operating-system*
   (operating-system*))