From 7bf1455088a51198a746069b2227433b2adb4a71 Mon Sep 17 00:00:00 2001
From: Madeline Hashcube <hashcube.dev@proton.me>
Date: Sun, 22 Mar 2026 17:25:27 -0500
Subject: [PATCH] More offloading from the flake

---
 flake.nix                 | 30 ------------------------------
 modules/users/default.nix |  7 +++++++
 modules/users/magames.nix | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 31 deletions(-)
 create mode 100644 modules/users/default.nix

diff --git a/flake.nix b/flake.nix
index f6d4e73..ceb4e20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,21 +66,6 @@
 
           ./modules/boot/plymouth.nix
           ./modules/nvidia.nix
-          {
-
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.backupFileExtension = "old";
-            home-manager.users.magames = {
-              imports = [
-                ./users/magames/default.nix
-                zen-browser.homeModules.beta
-                catppuccin.homeModules.catppuccin
-                nixvim.homeModules.nixvim
-                walker.homeManagerModules.default
-              ];
-            };
-          }
         ];
       };
       slate = nixpkgs.lib.nixosSystem {
@@ -103,21 +88,6 @@
           ./modules/users/magames.nix
           ./modules/network/gitea.nix
           ./modules/boot/plymouth.nix
-
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.backupFileExtension = "old";
-            home-manager.users.magames = {
-              imports = [
-                ./users/magames/default.nix
-                zen-browser.homeModules.beta
-                catppuccin.homeModules.catppuccin
-                nixvim.homeModules.nixvim
-                walker.homeManagerModules.default
-              ];
-            };
-          }
         ];
       };
       testIso = nixpkgs.lib.nixosSystem {
diff --git a/modules/users/default.nix b/modules/users/default.nix
new file mode 100644
index 0000000..c038478
--- /dev/null
+++ b/modules/users/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
+  home-manager.backupFileExtension = "old";
+}
diff --git a/modules/users/magames.nix b/modules/users/magames.nix
index e7a56ed..a7c78a2 100644
--- a/modules/users/magames.nix
+++ b/modules/users/magames.nix
@@ -1,5 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
+  imports = [
+    ./default.nix
+  ];
+
   users = {
 		defaultUserShell = pkgs.nushell;
 		users.magames = {
@@ -13,4 +17,13 @@
 	environment.shells = with pkgs; [
 		nushell
 	];
+  home-manager.users.magames = {
+    imports = [
+      ../../users/magames/default.nix
+      inputs.zen-browser.homeModules.beta
+      inputs.catppuccin.homeModules.catppuccin
+      inputs.nixvim.homeModules.nixvim
+      inputs.walker.homeManagerModules.default
+    ];
+  };
 }
-- 
2.51.2