From 4f82c8c5bbe8628b899d6a43e79908133b12a166 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sun, 19 May 2024 12:35:15 -0400
Subject: [PATCH] home-manager: moved to shared modules for multi user configs

---
 homeManagerModules/desktop/sway/redShift.nix |  2 +-
 hosts/fallarbor/home.nix                     |  4 ++--
 hosts/lavaridge/home.nix                     | 15 ++++++++++-----
 hosts/mauville/home.nix                      | 18 ++++++++++--------
 hosts/mossdeep/home.nix                      |  2 +-
 hosts/petalburg/home.nix                     |  2 +-
 hosts/rustboro/home.nix                      |  2 +-
 7 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/homeManagerModules/desktop/sway/redShift.nix b/homeManagerModules/desktop/sway/redShift.nix
index d179fddd..f09be7ce 100644
--- a/homeManagerModules/desktop/sway/redShift.nix
+++ b/homeManagerModules/desktop/sway/redShift.nix
@@ -10,4 +10,4 @@
       {command = "${lib.getExe pkgs.gammastep} -l 31.1:-94.1";} # TODO: automatic locations
     ];
   };
-}
\ No newline at end of file
+}
diff --git a/hosts/fallarbor/home.nix b/hosts/fallarbor/home.nix
index 306efca5..36235480 100644
--- a/hosts/fallarbor/home.nix
+++ b/hosts/fallarbor/home.nix
@@ -7,10 +7,10 @@
 }: {
   home-manager.users = {
     aly = {
-      imports = [../../homeManagerModules ../../aly.nix];
+      imports = [../../aly.nix];
     };
     dustin = {
-      imports = [../../homeManagerModules ../../dustin.nix];
+      imports = [../../dustin.nix];
     };
   };
 }
diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix
index e335ad23..2990d115 100644
--- a/hosts/lavaridge/home.nix
+++ b/hosts/lavaridge/home.nix
@@ -5,12 +5,17 @@
   lib,
   ...
 }: {
+  home-manager.sharedModules = [
+    {
+      imports = [../../homeManagerModules];
+      alyraffauf.desktop.sway.redShift = false;
+      alyraffauf.services.easyeffects = {
+        enable = true;
+        preset = "framework13";
+      };
+    }
+  ];
   home-manager.users.aly = {
     imports = [../../homeManagerModules ../../aly.nix];
-
-    alyraffauf.services.easyeffects = {
-      enable = true;
-      preset = "framework13";
-    };
   };
 }
diff --git a/hosts/mauville/home.nix b/hosts/mauville/home.nix
index e992f1e8..92f80bed 100644
--- a/hosts/mauville/home.nix
+++ b/hosts/mauville/home.nix
@@ -5,16 +5,18 @@
   lib,
   ...
 }: {
+  home-manager.sharedModules = [
+    {
+      imports = [../../homeManagerModules];
+      xdg.userDirs.music = "/mnt/Media/Music";
+      alyraffauf.desktop.hyprland.autoSuspend = false;
+      alyraffauf.desktop.sway.autoSuspend = false;
+    }
+  ];
   home-manager.users.aly = {
-    imports = [../../homeManagerModules ../../aly.nix];
-    xdg.userDirs.music = "/mnt/Media/Music";
-    alyraffauf.desktop.hyprland.autoSuspend = false;
-    alyraffauf.desktop.sway.autoSuspend = false;
+    imports = [../../aly.nix];
   };
   home-manager.users.dustin = {
-    imports = [../../homeManagerModules ../../dustin.nix];
-    xdg.userDirs.music = "/mnt/Media/Music";
-    alyraffauf.desktop.hyprland.autoSuspend = false;
-    alyraffauf.desktop.sway.autoSuspend = false;
+    imports = [../../dustin.nix];
   };
 }
diff --git a/hosts/mossdeep/home.nix b/hosts/mossdeep/home.nix
index ccf7ea28..bc1fdd80 100644
--- a/hosts/mossdeep/home.nix
+++ b/hosts/mossdeep/home.nix
@@ -6,6 +6,6 @@
   ...
 }: {
   home-manager.users.aly = {
-    imports = [../../homeManagerModules ../../aly.nix];
+    imports = [../../aly.nix];
   };
 }
diff --git a/hosts/petalburg/home.nix b/hosts/petalburg/home.nix
index 2f739b09..80fe21f0 100644
--- a/hosts/petalburg/home.nix
+++ b/hosts/petalburg/home.nix
@@ -6,7 +6,7 @@
   ...
 }: {
   home-manager.users.aly = {
-    imports = [../../homeManagerModules ../../aly.nix];
+    imports = [../../aly.nix];
     alyraffauf.desktop.sway = {
       tabletMode.enable = true;
     };
diff --git a/hosts/rustboro/home.nix b/hosts/rustboro/home.nix
index c7e40139..1d51b461 100644
--- a/hosts/rustboro/home.nix
+++ b/hosts/rustboro/home.nix
@@ -6,7 +6,7 @@
   ...
 }: {
   home-manager.users.aly = {
-    imports = [../../homeManagerModules ../../aly.nix];
+    imports = [../../aly.nix];
     alyraffauf = {
       services.easyeffects = {
         enable = true;