From 7457ecf7bb8a71225e4ddccff57b5bf5ecf974c7 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Fri, 23 Jan 2026 08:56:10 -0600
Subject: [PATCH] nixos/stalwart: improve code

* address review comments:
 https://github.com/NixOS/nixpkgs/pull/481815#discussion_r2719419333
 https://github.com/NixOS/nixpkgs/pull/481815#discussion_r2719421199
---
 nixos/modules/services/mail/stalwart.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/stalwart.nix b/nixos/modules/services/mail/stalwart.nix
index 3d7c6be0de53..2592377f9fba 100644
--- a/nixos/modules/services/mail/stalwart.nix
+++ b/nixos/modules/services/mail/stalwart.nix
@@ -170,7 +170,7 @@ in
       users = {
         ${cfg.user} = {
           isSystemUser = true;
-          group = "${cfg.group}";
+          inherit (cfg) group;
         };
       };
     };
@@ -220,8 +220,8 @@ in
           StateDirectory = if useLegacyDefault then "stalwart-mail" else "stalwart";
 
           # Upstream uses "stalwart" as the username since 0.12.0
-          User = "${cfg.user}";
-          Group = "${cfg.group}";
+          User = cfg.user;
+          Group = cfg.group;
 
           # Bind standard privileged ports
           AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];