From 3d50598ae007b175924344992cfcd41366e1bf57 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 11 Feb 2020 16:41:40 +0100
Subject: [PATCH] users: ensure uniqueness of gid/uid entries

Instead of a cryptic error during activation conflicting ids are now
caught during evaluation.

    error: The option `users.uids.30001' has conflicting definitions
---
 modules/users/default.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/users/default.nix b/modules/users/default.nix
index e791a49a..6605a28d 100644
--- a/modules/users/default.nix
+++ b/modules/users/default.nix
@@ -9,12 +9,17 @@ let
   user = import ./user.nix;
 
   toArguments = concatMapStringsSep " " (v: "'${v}'");
+  toGID = v: { "${toString v.gid}" = v.name; };
+  toUID = v: { "${toString v.uid}" = v.name; };
 
   isCreated = list: name: elem name list;
   isDeleted = attrs: name: ! elem name (mapAttrsToList (n: v: v.name) attrs);
 
-  createdGroups = mapAttrsToList (n: v: v) (filterAttrs (n: v: isCreated cfg.knownGroups v.name) cfg.groups);
-  createdUsers = mapAttrsToList (n: v: v) (filterAttrs (n: v: isCreated cfg.knownUsers v.name) cfg.users);
+  gids = mapAttrsToList (n: toGID) (filterAttrs (n: v: isCreated cfg.knownGroups v.name) cfg.groups);
+  uids = mapAttrsToList (n: toUID) (filterAttrs (n: v: isCreated cfg.knownUsers v.name) cfg.users);
+
+  createdGroups = mapAttrsToList (n: v: cfg.groups."${v}") cfg.gids;
+  createdUsers = mapAttrsToList (n: v: cfg.users."${v}") cfg.uids;
   deletedGroups = filter (n: isDeleted cfg.groups n) cfg.knownGroups;
   deletedUsers = filter (n: isDeleted cfg.users n) cfg.knownUsers;
 
@@ -55,6 +60,18 @@ in
       description = "Configuration for users.";
     };
 
+    users.gids = mkOption {
+      internal = true;
+      type = types.attrsOf types.str;
+      default = {};
+    };
+
+    users.uids = mkOption {
+      internal = true;
+      type = types.attrsOf types.str;
+      default = {};
+    };
+
     users.forceRecreate = mkOption {
       internal = true;
       type = types.bool;
@@ -65,6 +82,9 @@ in
 
   config = {
 
+    users.gids = mkMerge gids;
+    users.uids = mkMerge uids;
+
     system.activationScripts.groups.text = mkIf (cfg.knownGroups != []) ''
       echo "setting up groups..." >&2