From 3285b483e2066c83fdce602a2c1e6cf611925f1b Mon Sep 17 00:00:00 2001
From: Jan-Bulthuis <git@bulthuis.dev>
Date: Wed, 11 Jun 2025 12:42:06 +0200
Subject: [PATCH] Created standard local user hm config for VMs

---
 hosts/vm-audio/users/local.nix     | 7 -------
 hosts/vm-minecraft/users/local.nix | 7 -------
 hosts/vm-oddjob/users/local.nix    | 7 -------
 hosts/vm-vpn/users/local.nix       | 7 -------
 modules/nixos/domain.nix           | 1 +
 profiles/nixos/vm.nix              | 9 +++++++++
 6 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 hosts/vm-audio/users/local.nix
 delete mode 100644 hosts/vm-minecraft/users/local.nix
 delete mode 100644 hosts/vm-oddjob/users/local.nix
 delete mode 100644 hosts/vm-vpn/users/local.nix

diff --git a/hosts/vm-audio/users/local.nix b/hosts/vm-audio/users/local.nix
deleted file mode 100644
index 8ab93f7..0000000
--- a/hosts/vm-audio/users/local.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  home.stateVersion = "24.11";
-
-  modules.profiles.base.enable = true;
-}
diff --git a/hosts/vm-minecraft/users/local.nix b/hosts/vm-minecraft/users/local.nix
deleted file mode 100644
index 8ab93f7..0000000
--- a/hosts/vm-minecraft/users/local.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  home.stateVersion = "24.11";
-
-  modules.profiles.base.enable = true;
-}
diff --git a/hosts/vm-oddjob/users/local.nix b/hosts/vm-oddjob/users/local.nix
deleted file mode 100644
index 8ab93f7..0000000
--- a/hosts/vm-oddjob/users/local.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  home.stateVersion = "24.11";
-
-  modules.profiles.base.enable = true;
-}
diff --git a/hosts/vm-vpn/users/local.nix b/hosts/vm-vpn/users/local.nix
deleted file mode 100644
index 8ab93f7..0000000
--- a/hosts/vm-vpn/users/local.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  home.stateVersion = "24.11";
-
-  modules.profiles.base.enable = true;
-}
diff --git a/modules/nixos/domain.nix b/modules/nixos/domain.nix
index 93c39e2..d21ffaf 100644
--- a/modules/nixos/domain.nix
+++ b/modules/nixos/domain.nix
@@ -55,6 +55,7 @@ in
         ${pkgs.adcli}/bin/adcli join -D ${domain} \
           -U $ADCLI_JOIN_USER \
           -O $ADCLI_JOIN_OU \
+          --dont-expire-password=true \
           --stdin-password < ${cfg.join.passwordFile}
       '';
     };
diff --git a/profiles/nixos/vm.nix b/profiles/nixos/vm.nix
index 0e85485..0d7eb80 100644
--- a/profiles/nixos/vm.nix
+++ b/profiles/nixos/vm.nix
@@ -52,12 +52,21 @@ in
     modules.secrets.secrets."passwords/local-hashed".neededForUsers = true;
     users.mutableUsers = false;
     users.users.local = {
+      isNormalUser = true;
+      group = "local";
       hashedPasswordFile = config.sops.secrets."passwords/local-hashed".path;
       extraGroups = [ "wheel" ];
       openssh.authorizedKeys.keys = [
         "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKKxoQSxfYqf9ITN8Fhckk8WbY4dwtBAXOhC9jxihJvq Admin"
       ];
     };
+    users.groups.local = { };
+    home-manager.users.local =
+      { ... }:
+      {
+        home.stateVersion = "24.11";
+        modules.profiles.base.enable = true;
+      };
 
     # System packages
     environment.systemPackages = with pkgs; [