2 files changed, 93 insertions, 38 deletions

diff --git a/modules/by-name/co/constants/module.nix b/modules/by-name/co/constants/module.nix
index 7795c5f4..9de2bce1 100644
--- a/modules/by-name/co/constants/module.nix
+++ b/modules/by-name/co/constants/module.nix
@@ -1,59 +1,114 @@
 # This file is inspired by the `nixos/modules/misc/ids.nix`
 # file in nixpkgs.
-{lib, ...}: {
-  options.soispha.constants = {
+{
+  lib,
+  config,
+  ...
+}: {
+  options.vhack.constants = {
     ids.uids = lib.mkOption {
       internal = true;
       description = ''
-        The user IDs used in this nixos config.
+        The user IDs used in the vhack.eu nixos config.
       '';
-      type = lib.types.attrsOf (lib.types.ints.between 0 1000);
+      type = lib.types.attrsOf (lib.types.ints.between 0 400);
     };
     ids.gids = lib.mkOption {
       internal = true;
       description = ''
-        The group IDs used in this nixos config.
+        The group IDs used in the vhack.eu nixos config.
       '';
-      type = lib.types.attrsOf (lib.types.ints.between 0 1000);
+      type = lib.types.attrsOf (lib.types.ints.between 0 400);
     };
   };
 
-  config.soispha.constants = {
+  config.vhack.constants = {
     ids.uids = {
       # Keep this sorted with `!sort --numeric-sort --key=2 --field-separator="="`
-
-      wpa_supplicant = 986;
-      mandb = 991;
-      dhcpcd = 992;
-      systemd-oom = 993;
-      sshd = 994;
-      rtkit = 995;
-      nscd = 996;
-      nm-iodine = 997;
-      fwupd-refresh = 998;
-      avahi = 999;
+      systemd-coredump = 151; # GROUP
+      opendkim = 221;
+      mautrix-whatsapp = 222;
+      etebase-server = 223;
+      matrix-synapse = 224;
+      rspamd = 225;
+      knot-resolver = 226;
+      peertube = 231;
+      redis-mastodon = 232;
+      redis-peertube = 233;
+      redis-rspamd = 234;
+      redis-stalwart-mail = 235;
+      mastodon = 236;
+      stalwart-mail = 238;
+      acme = 328;
+      dhcpcd = 329;
+      nscd = 330;
+      sshd = 331;
+      systemd-oom = 332;
+      resolvconf = 333; # GROUP
+      nix-sync = 334;
+      nextcloud = 335;
+      redis-nextcloud = 336;
+      taskchampion = 337;
+      stalwart-mail-certificates = 338; # GROUP
+      sharkey = 339;
+      redis-sharkey = 340;
+      grocy = 341;
+      anubis = 342;
+      postfix-tlspol = 343;
+      rocie = 344;
+      fluent-bit = 345;
+      loki = 346;
+      grafana = 347;
+      node-exporter = 348;
+      smartctl-exporter-access = 349;
+      fail2ban = 350;
 
       # As per the NixOS file, the uids should not be greater or equal to 400;
     };
-    ids.gids = {
+    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.
-
-      wpa_supplicant = 986;
-      dhcpcd = 987;
-      lpadmin = 988;
-      resolvconf = 989;
-      systemd-oom = 990;
-      systemd-coredump = 991;
-      sshd = 992;
-      rtkit = 993;
-      polkituser = 994;
-      nscd = 995;
-      mandb = 996;
-      msr = 996;
-      fwupd-refresh = 997;
-      avahi = 998;
-      adbusers = 999;
+      inherit
+        (uids)
+        acme
+        anubis
+        dhcpcd
+        etebase-server
+        knot-resolver
+        mastodon
+        matrix-synapse
+        mautrix-whatsapp
+        nextcloud
+        nix-sync
+        nscd
+        opendkim
+        peertube
+        postfix-tlspol
+        redis-mastodon
+        redis-nextcloud
+        redis-peertube
+        redis-rspamd
+        redis-stalwart-mail
+        rspamd
+        sshd
+        stalwart-mail
+        systemd-oom
+        sharkey
+        redis-sharkey
+        grocy
+        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
+        rocie
+        fluent-bit
+        loki
+        grafana
+        node-exporter
+        smartctl-exporter-access
+        fail2ban
+        ;
 
       # The gid should match the uid. Thus should not be >= 400;
     };
diff --git a/modules/by-name/co/coredump/module.nix b/modules/by-name/co/coredump/module.nix
index 79e764eb..5b5ed92b 100644
--- a/modules/by-name/co/coredump/module.nix
+++ b/modules/by-name/co/coredump/module.nix
@@ -3,15 +3,15 @@
   lib,
   ...
 }: let
-  cfg = config.soispha.systemd.coredump;
+  cfg = config.vhack.systemd.coredump;
 in {
-  options.soispha.systemd.coredump = {
+  options.vhack.systemd.coredump = {
     enable = (lib.mkEnableOption "oomd") // {default = config.systemd.coredump.enable;};
   };
 
   config = lib.mkIf cfg.enable {
     users = {
-      groups.systemd-coredump.gid = config.soispha.constants.ids.gids.systemd-coredump;
+      groups.systemd-coredump.gid = config.vhack.constants.ids.gids.systemd-coredump;
     };
   };
 }