From 218901bd4c68d6a164959b10ebc1a8276f4261c9 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 23 Dec 2024 00:33:37 -0500
Subject: [PATCH] nixos/whisparr: Remove static IDs

---
 nixos/modules/misc/ids.nix               | 2 --
 nixos/modules/services/misc/whisparr.nix | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ca7fc9ebf8ad7..a2c0438801ad7 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -355,7 +355,6 @@ in
       rstudio-server = 324;
       localtimed = 325;
       automatic-timezoned = 326;
-      whisparr = 328;
 
       # When adding a uid, make sure it doesn't match an existing gid.
       #
@@ -683,7 +682,6 @@ in
       rstudio-server = 324;
       localtimed = 325;
       automatic-timezoned = 326;
-      whisparr = 328;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/misc/whisparr.nix b/nixos/modules/services/misc/whisparr.nix
index 8594a682ec9f3..bf15ee70fde44 100644
--- a/nixos/modules/services/misc/whisparr.nix
+++ b/nixos/modules/services/misc/whisparr.nix
@@ -64,10 +64,10 @@ in
       whisparr = {
         group = cfg.group;
         home = cfg.dataDir;
-        uid = config.ids.uids.whisparr;
+        isSystemUser = true;
       };
     };
 
-    users.groups = lib.mkIf (cfg.group == "whisparr") { whisparr.gid = config.ids.gids.whisparr; };
+    users.groups.whisparr = lib.mkIf (cfg.group == "whisparr") { };
   };
 }