1 files changed, 7 insertions, 10 deletions
diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm
index 80bb4a4..ca3eb7a 100644
--- a/systems/mcdowell.scm
+++ b/systems/mcdowell.scm
@@ -1,20 +1,17 @@
-(define-module (systems mcdowell)
-  #:use-module (users id1000)		; uid1000-account
-					; uid1000-home-environment
-					; uid1000-name
-  )
+(define-module (systems mcdowell))
 
 ;; string
 (define host-name*
   "mcdowell")
 
-;; (record user-account)
-(define users*
+(define (users-mcdowell)
+  (use-modules (users id1000))
   (list uid1000-account))
 
 ;;;???????????????????????????????????????????????????????????????????
 
-(define home-environments
+(define (home-environments-mcdowell)
+  (use-modules (users id1000))
   `((,uid1000-name ,(uid1000-home-environment host-name*))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -34,7 +31,7 @@
   (use-modules (gnu services guix))
   ((@ (gnu services) service)
    guix-home-service-type
-   home-environments))
+   (home-environments-mcdowell)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -63,7 +60,7 @@
    (host-name host-name*)
    (file-systems (file-systems* host-name*))
    (swap-devices (swap-devices* host-name*))
-   (users users*)
+   (users (users-mcdowell))
    (timezone "Europe/Warsaw")
    ;; locale*
    (services services-mcdowell)))