refactor!: introduce user obfuscation style

2 files changed, 13 insertions, 17 deletions

diff --git a/systems/ayase/system-configuration.scm b/systems/ayase/system-configuration.scm
index 3f4506a..b31d5f0 100644
--- a/systems/ayase/system-configuration.scm
+++ b/systems/ayase/system-configuration.scm
@@ -16,10 +16,10 @@
 
   ;;#:use-module (gnu services xorg)
 
-  ;; marekpasnikowski-account
-  ;; marekpasnikowski-home-environment
-  ;; marekpasnikowski-username
-  #:use-module (users marekpasnikowski)
+  ;; uid1000-account
+  ;; uid1000-home-environment
+  ;; uid1000-name
+  #:use-module (users id1000)
 
   ;; linux
   ;; linux-firmware
@@ -42,16 +42,14 @@
 (define users*
   (let* ((system-groups (list "wheel"))
 
-	 (supplementary-groups* (append system-groups))
-
-	 (marekpasnikowski (marekpasnikowski-account supplementary-groups*)))
-    (list marekpasnikowski)))
+	 (supplementary-groups* (append system-groups)))
+    (list (uid1000-account supplementary-groups*))))
 
 ;; record operating-system
 (define-public ayase
   (let* ((bootloader-targets (list "/boot/efi"))
 	 (efi-filesystem-id (uuid "B4FB-CBD9" 'fat32))
-	 (home-environments `((,marekpasnikowski-username ,(marekpasnikowski-home-environment host-name*))))
+	 (home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
 	 (root-filesystem-id (uuid "615a98cd-a632-4ee5-a6f4-e5ebcaa6fb8c"))
 
 	 (efi-partition (file-system (mount-point "/boot/efi")
diff --git a/systems/mcdowell.scm b/systems/mcdowell.scm
index 5b2aeca..ed74873 100644
--- a/systems/mcdowell.scm
+++ b/systems/mcdowell.scm
@@ -9,9 +9,9 @@
 					; initrd*
 					; kernel*
   #:use-module (suweren system)		; %suweren-operating-system
-  #:use-module (users marekpasnikowski) ; marekpasnikowski-account
-					; marekpasnikowski-home-environment
-					; marekpasnikowski-username
+  #:use-module (users id1000)		; uid1000-account
+					; uid1000-home-environment
+					; uid1000-name
   )
 
 ;; string
@@ -23,14 +23,12 @@
   (let* ((system-groups (list "wheel"))
 
 	 (supplementary-groups* (append hardware-groups
-					system-groups))
-
-	 (marekpasnikowski (marekpasnikowski-account supplementary-groups*)))
-    (list marekpasnikowski)))
+					system-groups)))
+    (list (uid1000-account supplementary-groups*))))
 
 ;; record operating-system
 (define operating-system*
-  (let* ((home-environments `((,marekpasnikowski-username ,(marekpasnikowski-home-environment host-name*))))
+  (let* ((home-environments `((,uid1000-name ,(uid1000-home-environment host-name*))))
 
 	 (guix-home (service guix-home-service-type
 			     home-environments))