From fab23b28ebf19eba9242e422a6567f80bc97bb8f Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 13 Jan 2024 18:01:23 +0100
Subject: [PATCH] put users into sub module

---
 modules/users/jopejoe1/default.nix | 4 ++--
 modules/users/root/default.nix     | 4 ++--
 systems/installer/default.nix      | 6 ++++--
 systems/inugami/default.nix        | 6 ++++--
 systems/kami/default.nix           | 6 ++++--
 systems/tuny/default.nix           | 6 ++++--
 systems/yokai/default.nix          | 6 ++++--
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/modules/users/jopejoe1/default.nix b/modules/users/jopejoe1/default.nix
index bce8ad4..cec9d15 100644
--- a/modules/users/jopejoe1/default.nix
+++ b/modules/users/jopejoe1/default.nix
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.jopejoe1.jopejoe1;
+let cfg = config.jopejoe1.user.jopejoe1;
 in {
-  options.jopejoe1.jopejoe1 = {
+  options.jopejoe1.user.jopejoe1 = {
     enable = lib.mkEnableOption "Enable jopejoe1 user";
   };
 
diff --git a/modules/users/root/default.nix b/modules/users/root/default.nix
index f9cd0c1..e475894 100644
--- a/modules/users/root/default.nix
+++ b/modules/users/root/default.nix
@@ -1,8 +1,8 @@
 { config, lib, ... }:
 
-let cfg = config.jopejoe1.root;
+let cfg = config.jopejoe1.user.root;
 in {
-  options.jopejoe1.root = { enable = lib.mkEnableOption "Enable root user"; };
+  options.jopejoe1.user.root = { enable = lib.mkEnableOption "Enable root user"; };
 
   config = lib.mkIf cfg.enable {
     users.users.root = {
diff --git a/systems/installer/default.nix b/systems/installer/default.nix
index b7e0cc0..3144c2d 100644
--- a/systems/installer/default.nix
+++ b/systems/installer/default.nix
@@ -9,8 +9,10 @@
     nix.enable = true;
     plasma6.enable = true;
     overlays.enable = true;
-    jopejoe1.enable = true;
-    root.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
     ssh.enable = true;
   };
 
diff --git a/systems/inugami/default.nix b/systems/inugami/default.nix
index 038e180..3e4f60e 100644
--- a/systems/inugami/default.nix
+++ b/systems/inugami/default.nix
@@ -25,8 +25,10 @@
     nix.enable = true;
     kodi.enable = true;
     plasma.enable = true;
-    root.enable = true;
-    jopejoe1.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
     ssh.enable = true;
   };
 
diff --git a/systems/kami/default.nix b/systems/kami/default.nix
index 8f50af3..05fa814 100644
--- a/systems/kami/default.nix
+++ b/systems/kami/default.nix
@@ -27,8 +27,10 @@
     sway.enable = true;
     minecraft-server.enable = true;
     repo-sync.enable = true;
-    jopejoe1.enable = true;
-    root.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
     boot.systemd.enable = true;
   };
 
diff --git a/systems/tuny/default.nix b/systems/tuny/default.nix
index fefd3c0..db98f55 100644
--- a/systems/tuny/default.nix
+++ b/systems/tuny/default.nix
@@ -13,9 +13,11 @@
     audio = { enable = true; };
     bluetooth.enable = true;
     local.enable = true;
-    jopejoe1.enable = true;
     nix.enable = true;
-    root.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
     boot.systemd.enable = true;
     ssh.enable = true;
   };
diff --git a/systems/yokai/default.nix b/systems/yokai/default.nix
index 6f93053..28fd290 100644
--- a/systems/yokai/default.nix
+++ b/systems/yokai/default.nix
@@ -13,8 +13,10 @@
     nix.enable = true;
     plasma.enable = true;
     sway.enable = true;
-    jopejoe1.enable = true;
-    root.enable = true;
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
     ssh.enable = true;
   };