From 9059e76b26bfb10851d23a674fd98016e826c848 Mon Sep 17 00:00:00 2001
From: Michael Thomas <michaelhthomas@outlook.com>
Date: Sun, 16 Jun 2024 15:07:20 -0400
Subject: [PATCH] fix: do not merge modules incorrectly

---
 flake.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index cdd4ef1..512ca03 100644
--- a/flake.nix
+++ b/flake.nix
@@ -91,20 +91,22 @@
     };
 
     nixosConfigurations = let
-      homeModule =
-        baseHomeModule
-        // {
-          home-manager.users.michael = import ./user/environments/nixos/home.nix;
-        };
+      fullNixOSModules =
+        defaultModules
+        ++ [
+          baseHomeModule
+          {
+            home-manager.users.michael = import ./user/environments/nixos/home.nix;
+          }
+        ];
     in {
       kitchen = nixpkgs.lib.nixosSystem {
         system = utils.lib.system.x86_64-linux;
         modules =
-          defaultModules
+          fullNixOSModules
           ++ [
             ./modules/common.nix
             ./modules/containers.nix
-            homeModule
 
             ./machines/kitchen/configuration.nix
           ];
@@ -114,12 +116,11 @@
       thinkcentre = nixpkgs.lib.nixosSystem {
         system = utils.lib.system.x86_64-linux;
         modules =
-          defaultModules
+          fullNixOSModules
           ++ [
             ./modules/common.nix
             ./modules/hyprland.nix
             ./modules/containers.nix
-            homeModule
 
             ./machines/thinkcentre/configuration.nix
             agenix.nixosModules.default
@@ -135,13 +136,12 @@
       terra = nixpkgs.lib.nixosSystem {
         system = utils.lib.system.x86_64-linux;
         modules =
-          defaultModules
+          fullNixOSModules
           ++ [
             ./modules/common.nix
             ./modules/hyprland.nix
             ./modules/containers.nix
             ./modules/applications/steam
-            homeModule
 
             ./machines/terra/configuration.nix
             agenix.nixosModules.default