From b88b46b830d31db6a532a3302c3e98a6697aee08 Mon Sep 17 00:00:00 2001
From: Austin Butler <austinabutler@gmail.com>
Date: Sun, 19 Sep 2021 12:42:46 -0700
Subject: [PATCH] nixos/tcsd: make group uid dynamic

---
 nixos/modules/misc/ids.nix               | 2 +-
 nixos/modules/services/hardware/tcsd.nix | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 5f56e0602279..28d471b35a86 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -210,7 +210,7 @@ in
       #fleet = 173; # unused
       #input = 174; # unused
       sddm = 175;
-      tss = 176;
+      #tss = 176; # dynamically allocated as of 2021-09-17
       #memcached = 177; removed 2018-01-03
       #ntp = 179; # dynamically allocated as of 2021-09-17
       zabbix = 180;
diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix
index 0d36bce357ba..c549a6775013 100644
--- a/nixos/modules/services/hardware/tcsd.nix
+++ b/nixos/modules/services/hardware/tcsd.nix
@@ -149,12 +149,10 @@ in
     users.users = optionalAttrs (cfg.user == "tss") {
       tss = {
         group = "tss";
-        uid = config.ids.uids.tss;
+        isSystemUser = true;
       };
     };
 
-    users.groups = optionalAttrs (cfg.group == "tss") {
-      tss.gid = config.ids.gids.tss;
-    };
+    users.groups = optionalAttrs (cfg.group == "tss") { tss = {}; };
   };
 }