From 6376fc4c2598faca0e0c42c3a48d097d4ca0c48e Mon Sep 17 00:00:00 2001
From: ed209 <git@ed209.dev>
Date: Tue, 30 Dec 2025 06:21:50 -0500
Subject: [PATCH] chore: move modules into configuration.nix

---
 flake.nix                       | 17 -----------------
 hosts/iso/iso.nix               |  8 +++++++-
 hosts/nixos/configuration.nix   |  5 +++++
 hosts/sachiel/configuration.nix |  7 +++++++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3aabfcf..65e6ec9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,35 +111,18 @@
         specialArgs = {inherit inputs outputs;};
         modules = [
           ./hosts/iso/iso.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.users.nixos = import ./home-manager/home-iso.nix;
-            home-manager.extraSpecialArgs = {inherit inputs outputs;};
-          }
         ];
       };
       iso-re = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
           ./hosts/iso/iso.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.users.nixos = import ./home-manager/home-iso.nix;
-            home-manager.extraSpecialArgs = {inherit inputs outputs;};
-          }
         ];
       };
       sachiel = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs outputs;};
         modules = [
           ./hosts/sachiel/configuration.nix
-          disko.nixosModules.disko
-          agenix.nixosModules.default
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.users."${inputs.nix-secrets.username}" = import ./home-manager/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs outputs;};
-          }
         ];
       };
     };
diff --git a/hosts/iso/iso.nix b/hosts/iso/iso.nix
index 15f3c9e..52c6be5 100644
--- a/hosts/iso/iso.nix
+++ b/hosts/iso/iso.nix
@@ -1,14 +1,20 @@
 {
   inputs,
+  outputs,
   modulesPath,
   pkgs,
   lib,
   ...
 }: {
-  imports = [
+  imports = with inputs; [
     "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix"
     # "${modulesPath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
     ../common/yubikey.nix
+    home-manager.nixosModules.home-manager
+    {
+      home-manager.users.nixos = import ../../home-manager/home-iso.nix;
+      home-manager.extraSpecialArgs = {inherit inputs outputs;};
+    }
   ];
   nix.settings = {
     # Enable flakes and new 'nix' command
diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix
index 7cb74a9..d1c405d 100644
--- a/hosts/nixos/configuration.nix
+++ b/hosts/nixos/configuration.nix
@@ -24,6 +24,11 @@
     # Import your generated (nixos-generate-config) hardware configuration
     ./hardware-configuration.nix
     agenix.nixosModules.default
+    home-manager.nixosModules.home-manager
+    {
+      home-manager.users."${inputs.nix-secrets.username}" = import ./home-manager/home.nix;
+      home-manager.extraSpecialArgs = {inherit inputs outputs;};
+    }
   ];
 
   age = with inputs; {
diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix
index a94cc67..cb2297b 100644
--- a/hosts/sachiel/configuration.nix
+++ b/hosts/sachiel/configuration.nix
@@ -17,6 +17,13 @@
     # inputs.hardware.nixosModules.common-cpu-amd
     # inputs.hardware.nixosModules.common-ssd
     impermanence.nixosModules.impermanence
+    disko.nixosModules.disko
+    agenix.nixosModules.default
+    home-manager.nixosModules.home-manager
+    {
+      home-manager.users."${inputs.nix-secrets.username}" = import ../../home-manager/home.nix;
+      home-manager.extraSpecialArgs = {inherit inputs outputs;};
+    }
 
     # You can also split up your configuration and import pieces of it here:
     # ./users.nix
-- 
2.51.2