From bb77fab6adccf097d5ebd543e23283160a4115b7 Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Wed, 9 Oct 2024 12:46:57 +0200 Subject: refactor(izumi): localize imports of module (gnu system accounts) --- systems/izumi/izumi.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'systems') 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))))) -- cgit v1.2.3