refactor(system): remove file-systems field from %suweren-operating-system

1 files changed, 7 insertions, 5 deletions

diff --git a/suweren/system.scm b/suweren/system.scm
index 0793cbb..bbdfa49 100644
--- a/suweren/system.scm
+++ b/suweren/system.scm
@@ -15,7 +15,7 @@
                                          ; syncthing-service-type
   #:use-module (gnu services xorg)       ; gdm-service-type
   #:use-module (gnu system)		 ; operating-system
-  #:use-module (gnu system file-systems) ; %base-file-systems
+  ;; #:use-module (gnu system file-systems) ; %base-file-systems
   #:use-module (gnu system shadow)	 ; %base-user-accounts
   #:use-module (guix channels)		 ; %default-channels
   #:use-module (guix gexp)		 ; plain-file
@@ -98,6 +98,9 @@
   (login-configuration (inherit configuration)
 		       (allow-empty-passwords? #f)))
 
+(define-public %suweren-file-systems
+  (@ (gnu system file-systems) %base-file-systems))
+
 ;; record syncthing-configuration
 (define syncthing-configuration*
   (syncthing-configuration (user "marek")))
@@ -120,7 +123,8 @@
 ;; string ->
 ;; (record service) ->
 ;; record operating-system
-(define-public %suweren-operating-system
+(define-public (suweren-operating-system)
+  (use-modules (gnu system file-systems))
   (let* ((sddm-configuration* (sddm-configuration (theme "breeze")
 						  (auto-login-user "lilia")))
 
@@ -141,8 +145,6 @@
 				 sddm
 				 syncthing))
 
-	 (file-systems* (append %base-file-systems
-				file-systems*))
 	 (services* (append %desktop-services*
 			    suweren-services
 			    services*))
@@ -154,7 +156,7 @@
 		      (initrd initrd*)
 		      (firmware firmware*)
 		      (host-name host-name*)
-		      (file-systems file-systems*)
+		      (file-systems %suweren-file-systems)
 		      (swap-devices swap-devices*)
 		      (users users*)
 		      (timezone timezone*)