refactor(akashi): localize module imports

1 files changed, 24 insertions, 41 deletions

diff --git a/systems/akashi.scm b/systems/akashi.scm
index 2b5e5fd..75d76c9 100644
--- a/systems/akashi.scm
+++ b/systems/akashi.scm
@@ -1,45 +1,27 @@
-(define-module (systems akashi)
-  ;; service
-  #:use-module (gnu services)
-
-  ;; guix-home-service-type
-  #:use-module (gnu services guix)
-
-  ;; keyboard-layout
-  #:use-module (gnu system keyboard)
-
-  ;; bootloader-configuration*
-  ;; file-systems*
-  ;; firmware*
-  ;; initrd*
-  ;; kernel*
-  ;; swap-devices*
-  #:use-module (machines thinkpad-x200)
-
-  ;; %suweren-operating-system
-  #:use-module (suweren system)
-
-  ;; uid1000-account
-  ;; uid1000-home-environment
-  ;; uid1000-name
-  #:use-module (users id1000))
+(define-module (systems akashi))
 
 ;; string
 (define host-name*
   "akashi")
 
 ;; (record* user-account)
-(define users*
+(define (users)
+  (use-modules (users id1000))
   (list uid1000-account))
 
 ;; record* operating-system
 (define (operating-system*)
+  (use-modules (gnu services guix)
+	       (machines thinkpad-x200)
+	       (users id1000))
   (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
 
-	 (guix-home (service guix-home-service-type
-			     home-environments))
+	 (guix-home ((@ (gnu services) service)
+		     guix-home-service-type
+		     home-environments))
 
-	 (keyboard-layout* (keyboard-layout "pl"))
+	 (keyboard-layout ((@ (gnu system keyboard) keyboard-layout)
+			   "pl"))
 	 (services* (list guix-home
 			  ((@ (gnu services base) udev-rules-service)
 			   'adb-udev
@@ -47,18 +29,19 @@
 	 (timezone* "Europe/Warsaw")
 	 ;; (locale* "en_US.utf8")
 	 )
-    (%suweren-operating-system kernel*
-			       (bootloader-configuration* keyboard-layout*)
-			       keyboard-layout*
-			       initrd*
-			       firmware*
-			       host-name*
-			       (file-systems* host-name*)
-			       (swap-devices* host-name*)
-			       users*
-			       timezone*
-			       ;; locale*
-			       services*)))
+    ((@ (suweren system) %suweren-operating-system)
+     kernel*
+     (bootloader-configuration* keyboard-layout)
+     keyboard-layout
+     initrd*
+     firmware*
+     host-name*
+     (file-systems* host-name*)
+     (swap-devices* host-name*)
+     (users)
+     timezone*
+     ;; locale*
+     services*)))
 
 (define-public operating-system*
   (operating-system*))