From 7e09d5ac72c0566abd3ba30ef0cff6657054cd99 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sat, 16 Mar 2024 16:01:42 -0400
Subject: [PATCH] moved host modules into host configs rather than flake.nix

---
 flake.nix                   |  7 -------
 hosts/lavaridge/default.nix | 11 +++++++----
 hosts/mauville/default.nix  |  7 +++++--
 hosts/petalburg/default.nix |  9 +++++----
 hosts/rustboro/default.nix  |  5 +++--
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 004fc985..7ff04e67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,8 +38,6 @@
           nixos-hardware.nixosModules.framework-13-7040-amd
           home-manager-unstable.nixosModules.home-manager
           ./hosts/lavaridge
-          ./modules/gnome
-          ./modules/homelab/virtualization.nix
         ];
       };
       
@@ -50,7 +48,6 @@
           nixos-hardware.nixosModules.lenovo-thinkpad-t440p
           home-manager-unstable.nixosModules.home-manager
           ./hosts/rustboro
-          ./modules/kde.nix
         ];
       };
 
@@ -62,7 +59,6 @@
           nixos-hardware.nixosModules.common-cpu-intel
           home-manager-unstable.nixosModules.home-manager
           ./hosts/petalburg
-          ./modules/gnome
         ];
       };
 
@@ -72,9 +68,6 @@
         modules = [
           home-manager-unstable.nixosModules.home-manager
           ./hosts/mauville
-          ./modules/homelab
-          ./modules/gnome
-          ./modules/steam.nix
         ];
       };
     };
diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 85efc352..f1acd7e0 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -4,11 +4,14 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../../users/aly.nix
-      ../../system
+    [
+      ../../modules/gnome
+      ../../modules/homelab/virtualization.nix
       ../../modules/plymouth.nix
+      ../../modules/steam.nix
+      ../../system
+      ../../users/aly.nix
+      ./hardware-configuration.nix # Include the results of the hardware scan.
     ];
 
   # Bootloader.
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index 0f2e4d8f..51f86793 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -5,9 +5,12 @@
 {
   imports =
     [ 
-      ./hardware-configuration.nix
-      ../../users/aly.nix
+      ../../modules/gnome
+      ../../modules/homelab
+      ../../modules/steam.nix
       ../../system
+      ../../users/aly.nix
+      ./hardware-configuration.nix
     ];
 
   # Bootloader.
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index e82c516c..0b8711bf 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -41,11 +41,12 @@ let
 
 in {
   imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../../users/aly.nix
-      ../../system
+    [ 
+      ../../modules/gnome
       ../../modules/plymouth.nix
+      ../../system
+      ../../users/aly.nix
+      ./hardware-configuration.nix # Include the results of the hardware scan.
     ];
 
   # Bootloader.
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index 1cbc6513..314c363e 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -4,11 +4,12 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+    [
+      ./hardware-configuration.nix # Include the results of the hardware scan.
       ../../users/aly.nix
       ../../system
       ../../modules/plymouth.nix
+      ../../modules/kde.nix
     ];
 
   # Bootloader.