From d2c45940d3d9181050a232c9e1b589cc1fc3a706 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Sun, 7 Jul 2024 21:07:35 -0400
Subject: [PATCH] flake: add homeManagerModules for each user

---
 flake.nix                      | 8 ++++++--
 homes/aly/default.nix          | 4 +---
 homes/dustin/default.nix       | 4 +---
 homes/morgan/default.nix       | 4 +---
 hosts/mauville/home.nix        | 3 ++-
 userModules/aly/default.nix    | 4 +++-
 userModules/dustin/default.nix | 4 +++-
 userModules/morgan/default.nix | 4 +++-
 8 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7f055e26..c5036140 100644
--- a/flake.nix
+++ b/flake.nix
@@ -72,8 +72,12 @@
         '';
       });
 
-    homeManagerModules.default =
-      import ./homeManagerModules inputs self;
+    homeManagerModules = {
+      default = import ./homeManagerModules inputs self;
+      aly = import ./homes/aly inputs self;
+      dustin = import ./homes/dustin inputs self;
+      morgan = import ./homes/morgan inputs self;
+    };
 
     nixosModules = {
       base = import ./baseModules inputs;
diff --git a/homes/aly/default.nix b/homes/aly/default.nix
index 25ccb642..ef531130 100644
--- a/homes/aly/default.nix
+++ b/homes/aly/default.nix
@@ -1,9 +1,7 @@
-{
+inputs: self: {
   config,
-  inputs,
   lib,
   pkgs,
-  self,
   ...
 }: {
   imports = [
diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix
index 19bce063..74e235bc 100644
--- a/homes/dustin/default.nix
+++ b/homes/dustin/default.nix
@@ -1,9 +1,7 @@
-{
+inputs: self: {
   config,
-  inputs,
   lib,
   pkgs,
-  self,
   ...
 }: {
   home = {
diff --git a/homes/morgan/default.nix b/homes/morgan/default.nix
index c327293a..848feefe 100644
--- a/homes/morgan/default.nix
+++ b/homes/morgan/default.nix
@@ -1,9 +1,7 @@
-{
+inputs: self: {
   config,
-  inputs,
   lib,
   pkgs,
-  self,
   ...
 }: {
   home = {
diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix
index 648adeed..911dc57c 100644
--- a/hosts/mauville/home.nix
+++ b/hosts/mauville/home.nix
@@ -3,6 +3,7 @@
   inputs,
   lib,
   pkgs,
+  self,
   ...
 }: {
   home-manager = {
@@ -14,7 +15,7 @@
     ];
 
     users.aly = lib.mkForce {
-      imports = [../../homes/aly];
+      imports = [self.homeManagerModules.aly];
       systemd.user = {
         services = {
           backblaze-sync = {
diff --git a/userModules/aly/default.nix b/userModules/aly/default.nix
index cad67464..8f0bd27d 100644
--- a/userModules/aly/default.nix
+++ b/userModules/aly/default.nix
@@ -1,14 +1,16 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
+  self,
   ...
 }: {
   config = lib.mkIf config.ar.users.aly.enable {
     home-manager.users.aly =
       lib.attrsets.optionalAttrs
       config.ar.users.aly.manageHome
-      (import ../../homes/aly);
+      (import ../../homes/aly inputs self);
 
     users.users.aly = {
       description = "Aly Raffauf";
diff --git a/userModules/dustin/default.nix b/userModules/dustin/default.nix
index 756832e7..7dd4fb42 100644
--- a/userModules/dustin/default.nix
+++ b/userModules/dustin/default.nix
@@ -1,14 +1,16 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
+  self,
   ...
 }: {
   config = lib.mkIf config.ar.users.dustin.enable {
     home-manager.users.dustin =
       lib.attrsets.optionalAttrs
       config.ar.users.dustin.manageHome
-      (import ../../homes/dustin);
+      (import ../../homes/dustin inputs self);
 
     users.users.dustin = {
       description = "Dustin Raffauf";
diff --git a/userModules/morgan/default.nix b/userModules/morgan/default.nix
index 2b93f190..7e9e247a 100644
--- a/userModules/morgan/default.nix
+++ b/userModules/morgan/default.nix
@@ -1,14 +1,16 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
+  self,
   ...
 }: {
   config = lib.mkIf config.ar.users.morgan.enable {
     home-manager.users.morgan =
       lib.attrsets.optionalAttrs
       config.ar.users.morgan.manageHome
-      (import ../../homes/morgan);
+      (import ../../homes/morgan inputs self);
 
     users.users.morgan = {
       description = "Morgan Tamayo";