refactor(deployment): delocalize import of (users id1000)

4 files changed, 20 insertions, 23 deletions

diff --git a/systems/akashi.scm b/systems/akashi.scm
index 0a4ebe3..0084d7f 100644
--- a/systems/akashi.scm
+++ b/systems/akashi.scm
@@ -1,4 +1,5 @@
-(define-module (systems akashi))
+(define-module (systems akashi)
+  #:use-module (users id1000))
 
 (define root-partition
   ((@ (gnu system file-systems) file-system)
@@ -33,8 +34,7 @@
 		   'adb-udev
 		   (@ (gnu packages android) android-udev-rules))))))
 
-(define (users)
-  (use-modules (users id1000))
+(define users
   (list uid1000-account))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -45,8 +45,7 @@
 	       (machines thinkpad-x200)
 	       (nongnu packages linux)
 	       (suweren commons sudoers)
-	       (suweren system)
-	       (users id1000))
+	       (suweren system))
   (let* ((patter-placeholder #f)
 	 (timezone* "Europe/Warsaw"))
     ((@ (gnu system) operating-system)
@@ -56,7 +55,7 @@
      (host-name host-name*)
      (file-systems (file-systems))
      (swap-devices (swap-devices* host-name*))
-     (users (users))
+     (users users)
      (timezone timezone*)
      (locale polish-locale-string)
      (locale-definitions %suweren-locale-definitions)
diff --git a/systems/ayase.scm b/systems/ayase.scm
index 1c14e8d..f881268 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -1,4 +1,5 @@
-(define-module (systems ayase))
+(define-module (systems ayase)
+  #:use-module (users id1000))
 
 (define efi-filesystem-uuid
   ((@ (gnu system uuid) uuid)
@@ -43,8 +44,7 @@
                           ruby))))
 
 (define (home-services)
-  (use-modules (gnu services guix)
-               (users id1000))
+  (use-modules (gnu services guix))
   (let ((uid1000-home-environment* (uid1000-home-environment host-name)))
     ((@ (gnu services) service)
      guix-home-service-type
@@ -130,8 +130,7 @@
   (swap-label "-2"))
 
 (define (users)
-  (use-modules (gnu system accounts)
-               (users id1000))
+  (use-modules (gnu system accounts))
   (append (@ (gnu system shadow) %base-user-accounts)
           (list uid1000-account)))
 
diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index b7a10d8..809ccdc 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -1,4 +1,5 @@
-(define-module (systems izumi izumi))
+(define-module (systems izumi izumi)
+  #:use-module (users id1000))
 
 (define radicale-keys "/secrets/radicale/keys")
 (define dovecot-keys "/secrets/dovecot")
@@ -493,9 +494,9 @@
 
 (define services-izumi
   (append (desktop-services-izumi)
-          (list (@ (users id1000) dkim-service)
-                (@ (users id1000) dovecot-service)
-                (@ (users id1000) smtp-service)
+          (list dkim-service
+                dovecot-service
+                smtp-service
                 (certbot)
                 (cgit-izumi)
                 (etc-mailname)
@@ -514,7 +515,6 @@
 
 (define (users-izumi)
   (use-modules (gnu system shadow)
-               (users id1000)
                (users vmail))
   (append %base-user-accounts
           (list uid1000-account
diff --git a/systems/mcdowell.scm b/systems/mcdowell-old.scm
index 3fa8b21..f915087 100644
--- a/systems/mcdowell.scm
+++ b/systems/mcdowell-old.scm
@@ -1,4 +1,5 @@
-(define-module (systems mcdowell))
+(define-module (systems mcdowell-old)
+  #:use-module (users id1000))
 
 (define host-name*
   "mcdowell")
@@ -51,8 +52,7 @@
              (copy-recursively (string-append bootloader "/lib/")
                                install-dir)))))))
 
-(define (home-environments-mcdowell)
-  (use-modules (users id1000))
+(define home-environments-mcdowell
   `((,uid1000-name ,(uid1000-home-environment host-name*))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -79,7 +79,7 @@
   (use-modules (gnu services guix))
   ((@ (gnu services) service)
    guix-home-service-type
-   (home-environments-mcdowell)))
+   home-environments-mcdowell))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -101,8 +101,7 @@
   (append (desktop-services-mcdowell)
           (list (guix-home-service-mcdowell))))
 
-(define (users-mcdowell)
-  (use-modules (users id1000))
+(define users-mcdowell
   (list uid1000-account))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -146,7 +145,7 @@
      (mapped-devices (list))
      (file-systems (file-systems* host-name*))
      (swap-devices (swap-devices* host-name*))
-     (users (users-mcdowell))
+     (users users-mcdowell)
      (groups %base-groups)
      (skeletons default-skeletons)
      (issue %default-issue)