From a1ba8775f43bbeff2fc346e6496de788184fa19b Mon Sep 17 00:00:00 2001
From: kalipso <kalipso@c3d2.de>
Date: Mon, 21 Sep 2026 14:19:28 +0200
Subject: [PATCH] [machines] disable deprecated malobeo user

---
 machines/durruti/configuration.nix     | 7 ++++++-
 machines/infradocs/configuration.nix   | 7 ++++++-
 machines/lucia/configuration.nix       | 9 +++++++--
 machines/nextcloud/configuration.nix   | 7 ++++++-
 machines/ns1/configuration.nix         | 7 ++++++-
 machines/overwatch/configuration.nix   | 7 ++++++-
 machines/pretalx/configuration.nix     | 1 +
 machines/testvm/configuration.nix      | 8 ++++++--
 machines/uptimekuma/configuration.nix  | 7 ++++++-
 machines/vaultwarden/configuration.nix | 7 ++++++-
 machines/vpn/configuration.nix         | 7 ++++++-
 machines/zineshop/configuration.nix    | 7 ++++++-
 12 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/machines/durruti/configuration.nix b/machines/durruti/configuration.nix
index f0573d0..3a6a5d4 100644
--- a/machines/durruti/configuration.nix
+++ b/machines/durruti/configuration.nix
@@ -20,11 +20,16 @@ with lib;
     self.nixosModules.malobeo.metrics
     inputs.tasklist.nixosModules.malobeo-tasklist
 
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   malobeo.metrics = {
     enable = true;
     enablePromtail = true;
diff --git a/machines/infradocs/configuration.nix b/machines/infradocs/configuration.nix
index 7064a96..d9fff57 100644
--- a/machines/infradocs/configuration.nix
+++ b/machines/infradocs/configuration.nix
@@ -11,10 +11,15 @@ with lib;
   imports = [
     inputs.malobeo.nixosModules.malobeo.metrics
     ../durruti/documentation.nix
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   malobeo.metrics = {
     enable = true;
     enablePromtail = true;
diff --git a/machines/lucia/configuration.nix b/machines/lucia/configuration.nix
index 06e5aae..5ddf07d 100644
--- a/machines/lucia/configuration.nix
+++ b/machines/lucia/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, self, ... }:
 
 let
   sshKeys = import ../ssh_keys.nix;
@@ -7,9 +7,14 @@ in
   imports =
     [ # Include the results of the hardware scan.
       ./hardware_configuration.nix
-      ../modules/malobeo_user.nix
+      self.nixosModules.malobeo.users
     ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   sops.defaultSopsFile = ./secrets.yaml;
   sops.secrets.njala_api_key = {};
 
diff --git a/machines/nextcloud/configuration.nix b/machines/nextcloud/configuration.nix
index cd0439f..56436f7 100644
--- a/machines/nextcloud/configuration.nix
+++ b/machines/nextcloud/configuration.nix
@@ -21,12 +21,17 @@ in
 
   imports = [
     self.nixosModules.malobeo.metrics
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
     ../modules/autoupdate.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   malobeo.metrics = {
     enable = true;
     enablePromtail = true;
diff --git a/machines/ns1/configuration.nix b/machines/ns1/configuration.nix
index 1b397b9..4695053 100644
--- a/machines/ns1/configuration.nix
+++ b/machines/ns1/configuration.nix
@@ -13,13 +13,18 @@ in
   };
 
   imports = [
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
     ../modules/autoupdate.nix
     inputs.self.nixosModules.malobeo.vpn
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   networking.firewall = {
     enable = true;
     allowedTCPPorts = [ 53 ];
diff --git a/machines/overwatch/configuration.nix b/machines/overwatch/configuration.nix
index dfe722a..7b4b06b 100644
--- a/machines/overwatch/configuration.nix
+++ b/machines/overwatch/configuration.nix
@@ -31,11 +31,16 @@ in
 
   imports = [
     self.nixosModules.malobeo.metrics
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ./printer_module.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   networking.firewall.allowedTCPPorts = [ 80 3100 ];
 
   malobeo.metrics = {
diff --git a/machines/pretalx/configuration.nix b/machines/pretalx/configuration.nix
index decc3bf..7cc0efc 100644
--- a/machines/pretalx/configuration.nix
+++ b/machines/pretalx/configuration.nix
@@ -37,6 +37,7 @@ in
 
   malobeo.users = {
     admin = true;
+    malobeo = false;
   };
 
 
diff --git a/machines/testvm/configuration.nix b/machines/testvm/configuration.nix
index 26afea6..befd0cc 100644
--- a/machines/testvm/configuration.nix
+++ b/machines/testvm/configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, inputs, ... }:
+{ config, self, pkgs, inputs, ... }:
 let
   sshKeys = import ../ssh_keys.nix;
 in
@@ -6,13 +6,17 @@ in
   imports =
     [ # Include the results of the hardware scan.
       #./hardware-configuration.nix
-      ../modules/malobeo_user.nix
+      self.nixosModules.malobeo.users
       ../modules/sshd.nix
       ../modules/minimal_tools.nix
       inputs.self.nixosModules.malobeo.initssh
       inputs.self.nixosModules.malobeo.disko
     ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
 
   boot.initrd.systemd.enable = true;
   boot.loader.systemd-boot.enable = true;
diff --git a/machines/uptimekuma/configuration.nix b/machines/uptimekuma/configuration.nix
index 7da2cf9..59c97e3 100644
--- a/machines/uptimekuma/configuration.nix
+++ b/machines/uptimekuma/configuration.nix
@@ -9,10 +9,15 @@ with lib;
   };
 
   imports = [
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   networking.firewall.allowedTCPPorts = [ 80 ];
 
   services.nginx = {
diff --git a/machines/vaultwarden/configuration.nix b/machines/vaultwarden/configuration.nix
index cc6a088..7d2c0fc 100644
--- a/machines/vaultwarden/configuration.nix
+++ b/machines/vaultwarden/configuration.nix
@@ -16,11 +16,16 @@ with lib;
   };
 
   imports = [
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     inputs.self.nixosModules.malobeo.metrics
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   networking.firewall.allowedTCPPorts = [ 80 ];
 
   malobeo.metrics = {
diff --git a/machines/vpn/configuration.nix b/machines/vpn/configuration.nix
index c6d3f0a..42c65f9 100644
--- a/machines/vpn/configuration.nix
+++ b/machines/vpn/configuration.nix
@@ -18,11 +18,16 @@ with lib;
 
   imports = [
     inputs.self.nixosModules.malobeo.vpn
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
     ../modules/minimal_tools.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   services.malobeo.vpn = {
     enable = true;
     name = "vpn";
diff --git a/machines/zineshop/configuration.nix b/machines/zineshop/configuration.nix
index 11bb260..5101e3b 100644
--- a/machines/zineshop/configuration.nix
+++ b/machines/zineshop/configuration.nix
@@ -12,10 +12,15 @@ with lib;
     inputs.malobeo.nixosModules.malobeo.metrics
     inputs.malobeo.nixosModules.malobeo.printing
     inputs.zineshop.nixosModules.zineshop
-    ../modules/malobeo_user.nix
+    self.nixosModules.malobeo.users
     ../modules/sshd.nix
   ];
 
+  malobeo.users = {
+    admin = true;
+    malobeo = false;
+  };
+
   malobeo.metrics = {
     enable = true;
     enablePromtail = true;