summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--systems/izumi/izumi.scm27
1 files changed, 14 insertions, 13 deletions
diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index 893b945..b00c919 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -3,8 +3,7 @@
(define radicale-keys "/secrets/radicale/keys")
(define dovecot-keys "/secrets/dovecot")
-(use-modules (gnu system accounts)
- (gnu system file-systems)
+(use-modules (gnu system file-systems)
(gnu system keyboard)
(gnu system mapped-devices)
(guix build-system emacs)
@@ -16,16 +15,18 @@
(define (nginx-accounts)
(use-modules (gnu packages))
- (list (user-group (name "nginx")
- (system? #t))
- (user-account (name "nginx")
- (group "nginx")
- (supplementary-groups '("git"))
- (system? #t)
- (comment "nginx server user")
- (home-directory "/var/empty")
- (shell (file-append (specification->package "shadow")
- "/sbin/nologin")))))
+ (list ((@ (gnu system accounts) user-group)
+ (name "nginx")
+ (system? #t))
+ ((@ (gnu system accounts) user-account)
+ (name "nginx")
+ (group "nginx")
+ (supplementary-groups '("git"))
+ (system? #t)
+ (comment "nginx server user")
+ (home-directory "/var/empty")
+ (shell (file-append (specification->package "shadow")
+ "/sbin/nologin")))))
(define (nginx-service-type*)
(use-modules (gnu services)
@@ -473,7 +474,7 @@
(define groups-izumi
(append %base-groups
(list
- (user-group
+ ((@ (gnu system accounts) user-group)
(name "vmail")
(system? #t)))))