From 654c41d75e7be7a3d4f97d85c32d885ac6325368 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 12 Jun 2025 11:47:12 +0200
Subject: [PATCH] make all users systemusers

---
 nixos-modules/users/builder/default.nix  | 4 ++--
 nixos-modules/users/jopejoe1/default.nix | 8 ++++++--
 nixos-modules/users/root/default.nix     | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos-modules/users/builder/default.nix b/nixos-modules/users/builder/default.nix
index 8012446..3cd4be7 100644
--- a/nixos-modules/users/builder/default.nix
+++ b/nixos-modules/users/builder/default.nix
@@ -15,9 +15,9 @@ in
 
   config = lib.mkIf cfg.enable {
     users.users.builder = {
-      isNormalUser = true;
+      isSystemUser = true;
       description = "Build User";
-      hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
+      initialHashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGvmivSRjYMSo6+mxChJ7n6k4no4Vkxb6r0In9ZjcqFY root@omoikane"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVR16DtqrdgMq+3Gj1N6XNAjJhHyuG5a4wn7xQ8c49i root@omoikane"
diff --git a/nixos-modules/users/jopejoe1/default.nix b/nixos-modules/users/jopejoe1/default.nix
index ec9fc91..00cb65e 100644
--- a/nixos-modules/users/jopejoe1/default.nix
+++ b/nixos-modules/users/jopejoe1/default.nix
@@ -16,10 +16,10 @@ in
   config = lib.mkIf cfg.enable {
     programs.dconf.enable = true;
     users.users.jopejoe1 = {
-      isNormalUser = true;
+      isSystemUser = true;
       shell = pkgs.nushell;
       description = "jopejoe1";
-      hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
+      initialHashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
       extraGroups = [
         "wheel"
         "networkmanager"
@@ -30,6 +30,10 @@ in
         "dialout"
       ];
       uid = 1000;
+      group = "users";
+      createHome = true;
+      homeMode = "700";
+      home = "${config.users.defaultUserHome}/${config.users.users.jopejoe1.name}";
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB8oyMpS2hK3gQXyHIIVS6oilgMpemLmfhKKJ6RBMwUh johannes@joens.email"
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP3pKtvhOOjG1pGJq7cVHS5uWy5IP8y1Ra/ENpmJcqOe root@zap"
diff --git a/nixos-modules/users/root/default.nix b/nixos-modules/users/root/default.nix
index 5299f31..d86e3de 100644
--- a/nixos-modules/users/root/default.nix
+++ b/nixos-modules/users/root/default.nix
@@ -10,7 +10,7 @@ in
 
   config = lib.mkIf cfg.enable {
     users.users.root = {
-      hashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
+      initialHashedPassword = "$2b$05$Uk84TY/RHlH8DIigUlFYjeorjTlCMEY9wN2pAcw5BLaPoc7dKiSsC";
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB8oyMpS2hK3gQXyHIIVS6oilgMpemLmfhKKJ6RBMwUh johannes@joens.email"
       ];