From 1cea965bc1385fd62faa2a3f5d0ade70f3bc8f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Oct 2024 13:29:00 +0200
Subject: [PATCH] switch from userborn to sysusers

fixes #2117
---
 nixosModules/clanCore/vm.nix      | 4 ++--
 nixosModules/clanCore/waypipe.nix | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/nixosModules/clanCore/vm.nix b/nixosModules/clanCore/vm.nix
index e666f7159..05951f6be 100644
--- a/nixosModules/clanCore/vm.nix
+++ b/nixosModules/clanCore/vm.nix
@@ -47,8 +47,8 @@ let
     ];
     boot.initrd.systemd.emergencyAccess = true;
 
-    # sysusers would be faster because it doesn't need perl, but it cannot create normal users
-    systemd.sysusers.enable = true;
+    # userborn would be faster because it doesn't need perl, but it cannot create normal users
+    services.userborn.enable = true;
     users.mutableUsers = false;
     users.allowNoPasswordLogin = true;
 
diff --git a/nixosModules/clanCore/waypipe.nix b/nixosModules/clanCore/waypipe.nix
index 6b590cd9f..20d830e96 100644
--- a/nixosModules/clanCore/waypipe.nix
+++ b/nixosModules/clanCore/waypipe.nix
@@ -45,9 +45,7 @@
     security.sudo.wheelNeedsPassword = false;
 
     users.users.user = lib.mkIf (config.clan.services.waypipe.user == "user") {
-      # workaround sysusers
-      isSystemUser = true;
-      uid = 998;
+      uid = 1000;
       group = "users";
       initialPassword = "";
       extraGroups = [