refactor(ayase): localize module import inside users

1 files changed, 7 insertions, 16 deletions

diff --git a/systems/ayase.scm b/systems/ayase.scm
index 3393008..5414d5e 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -38,11 +38,6 @@
   ;; libvirt-service-type
   #:use-module (gnu services virtualization)
 
-  ;; uid1000-account
-  ;; uid1000-home-environment
-  ;; uid1000-name
-  #:use-module (users id1000)
-
   ;; linux
   ;; linux-firmware
   #:use-module (nongnu packages linux)
@@ -56,26 +51,23 @@
   ;; %distribution-services
   #:use-module (suweren services))
 
-;; string
 (define host-name
   "ayase")
 
 ;;;
 
-;; (alist string #<home-environment>)
-(define home-environments
+(define (home-environments)
+  (use-modules (users id1000))
   `((,uid1000-name ,(uid1000-home-environment host-name))))
 
-;; #<file-system-label>
 (define (swap-label number)
   (file-system-label (string-append host-name
 				    "-swap"
 				    number)))
 
-;; #<service>
 (define home-services
   (service guix-home-service-type
-	   home-environments))
+	   (home-environments)))
 
 ;; #<swap-space>
 (define swap-1
@@ -107,9 +99,7 @@
 ;; (list #<service>)
 (define services
   (append %distribution-services
-	  (list ;; (@ (users id1000)
-		;;    dovecot)
-		home-services)
+	  (list home-services)
 	  system-services))
 
 ;; (list #<swap-space>)
@@ -118,7 +108,8 @@
 	swap-2))
 
 ;; (list #<user-account>)
-(define users
+(define (users)
+  (use-modules (users id1000))
   (append %base-user-accounts
 	  (list uid1000-account)))
 
@@ -159,7 +150,7 @@
                       (host-name host-name)
                       (file-systems file-systems)
                       (swap-devices swap-devices)
-                      (users users)
+                      (users (users))
                       (timezone "Europe/Warsaw")
                       ;; (locale "en_US.utf8")
                       (services services)