modules/constants: Also add a user to each group, so that duplicated gids are avoided

1 files changed, 10 insertions, 7 deletions

diff --git a/modules/by-name/co/constants/module.nix b/modules/by-name/co/constants/module.nix
index 743ac65..2115a37 100644
--- a/modules/by-name/co/constants/module.nix
+++ b/modules/by-name/co/constants/module.nix
@@ -25,6 +25,7 @@
   config.vhack.constants = {
     ids.uids = {
       # Keep this sorted with `!sort --numeric-sort --key=2 --field-separator="="`
+      systemd-coredump = 151; # GROUP
       opendkim = 221;
       mautrix-whatsapp = 222;
       etebase-server = 223;
@@ -43,18 +44,22 @@
       nscd = 330;
       sshd = 331;
       systemd-oom = 332;
+      resolvconf = 333; # GROUP
       nix-sync = 334;
       nextcloud = 335;
       redis-nextcloud = 336;
       taskchampion = 337;
-      sharkey = 338;
-      redis-sharkey = 339;
+      stalwart-mail-certificates = 338; # GROUP
+      sharkey = 339;
+      redis-sharkey = 340;
 
       # As per the NixOS file, the uids should not be greater or equal to 400;
     };
     ids.gids = let
       inherit (config.vhack.constants.ids) uids;
     in {
+      # Please add your groups to the users and inherit them here.
+      # This avoids having an user/group id mismatch.
       inherit
         (uids)
         acme
@@ -80,13 +85,11 @@
         systemd-oom
         sharkey
         redis-sharkey
+        systemd-coredump # matches systemd-coredump user
+        resolvconf # This group is not matched to an user?
+        stalwart-mail-certificates # This group is used to connect nginx and stalwart-mail
         ;
 
-      # Keep this sorted with `!sort --numeric-sort --key=2 --field-separator="="`
-      systemd-coredump = 151; # matches systemd-coredump user
-      resolvconf = 333; # This group is not matched to an user?
-      stalwart-mail-certificates = 338; # This group is used to connect nginx and stalwart-mail
-
       # The gid should match the uid. Thus should not be >= 400;
     };
   };