refactor(izumi): merge with the external definition of id1000

3 files changed, 6 insertions, 15 deletions

diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index f54a52d..e736095 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -305,13 +305,7 @@
             ( home-directory "/home/vmail" )
             ( name "vmail" )
             ( system? #t ) )
-          ( user-account
-            ( comment "Marek Paśnikowski" )
-            ( group "users" )
-            ( home-directory "/home/marek" )
-            ( name "marek" )
-            ( supplementary-groups
-              ( list "audio" "netdev" "video" "wheel" ) ) ) ) ) ) )
+          (@ (users id1000) uid1000-account) ) ) ) )
 #+END_SRC
 
 #+NAME: OPENSMTPD-CONFIGURATION-FILE
diff --git a/systems/izumi/system-configuration.scm b/systems/izumi/system-configuration.scm
index 51ed474..541a91f 100644
--- a/systems/izumi/system-configuration.scm
+++ b/systems/izumi/system-configuration.scm
@@ -295,10 +295,4 @@
           ( home-directory "/home/vmail" )
           ( name "vmail" )
           ( system? #t ) )
-        ( user-account
-          ( comment "Marek Paśnikowski" )
-          ( group "users" )
-          ( home-directory "/home/marek" )
-          ( name "marek" )
-          ( supplementary-groups
-            ( list "audio" "netdev" "video" "wheel" ) ) ) ) ) ) )
+        (@ (users id1000) uid1000-account) ) ) ) )
diff --git a/users/id1000.scm b/users/id1000.scm
index c286e01..cf7e3f2 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -494,7 +494,10 @@
    (userdbs (list dovecot-userdb-static-configuration))))
 
 (define groups
-  (list "libvirt"
+  (list "audio"
+	"libvirt"
+	"netdev"
+	"video"
 	"wheel"))
 
 (define opensmtpd-configuration*