From d64a4fd72808223ce0a883318a3ea106c1008b29 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Tue, 1 Oct 2024 00:34:03 +0200
Subject: refactor(izumi): abstract away the vmail user account

---
 systems/izumi/izumi.org                | 14 +++-----------
 systems/izumi/system-configuration.scm | 14 +++-----------
 users/vmail.scm                        | 12 ++++++++++++
 3 files changed, 18 insertions(+), 22 deletions(-)
 create mode 100644 users/vmail.scm

diff --git a/systems/izumi/izumi.org b/systems/izumi/izumi.org
index e736095..9932bee 100644
--- a/systems/izumi/izumi.org
+++ b/systems/izumi/izumi.org
@@ -295,17 +295,9 @@
         ( swap-space
           ( target "/dev/sda3" ) ) ) )
     ( timezone "Europe/Warsaw" )
-    ( users
-      ( append
-        %base-user-accounts
-        ( list
-          ( user-account
-            ( comment "vmail" )
-            ( group "vmail" )
-            ( home-directory "/home/vmail" )
-            ( name "vmail" )
-            ( system? #t ) )
-          (@ (users id1000) uid1000-account) ) ) ) )
+    (users (append %base-user-accounts
+  		 (list (@ (users vmail) vmail-account)
+  		       (@ (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 541a91f..68f2aaa 100644
--- a/systems/izumi/system-configuration.scm
+++ b/systems/izumi/system-configuration.scm
@@ -285,14 +285,6 @@
       ( swap-space
         ( target "/dev/sda3" ) ) ) )
   ( timezone "Europe/Warsaw" )
-  ( users
-    ( append
-      %base-user-accounts
-      ( list
-        ( user-account
-          ( comment "vmail" )
-          ( group "vmail" )
-          ( home-directory "/home/vmail" )
-          ( name "vmail" )
-          ( system? #t ) )
-        (@ (users id1000) uid1000-account) ) ) ) )
+  (users (append %base-user-accounts
+		 (list (@ (users vmail) vmail-account)
+		       (@ (users id1000) uid1000-account)))))
diff --git a/users/vmail.scm b/users/vmail.scm
new file mode 100644
index 0000000..4d3b2c0
--- /dev/null
+++ b/users/vmail.scm
@@ -0,0 +1,12 @@
+(define-module (users vmail))
+
+(define vmail-name
+  "vmail")
+
+(define-public vmail-account
+  ((@ (gnu system accounts) user-account)
+   (name vmail-name)
+   (group vmail-name)
+   (comment "used to own and manage mailboxes")
+   (home-directory "/home/vmail")
+   (system? #t)))
-- 
cgit v1.2.3