refactor(modules): separate nixos/home-manager modules, use standard option conventions

1 files changed, 16 insertions, 16 deletions

diff --git a/lib/default.nix b/lib/default.nix
index df6aa0f..76bcb08 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -25,24 +25,24 @@ in
         nixpkgs.overlays = overlays;
         nixpkgs.config.allowUnfree = true;
 
-      nix.settings.experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
+        nix.settings.experimental-features = [
+          "nix-command"
+          "flakes"
+        ];
       };
 
-      modules =
-        [
-          hostCfg
-          nixpkgsModule
-        ]
-        ++ (lib.optional useHomeManager (
-          if darwinHost then
-            inputs.home-manager.darwinModules.home-manager
-          else
-            inputs.home-manager.nixosModules.home-manager
-        ))
-        ++ extraModules;
+      modules = [
+        hostCfg
+        nixpkgsModule
+      ]
+      ++ (lib.optional (!darwinHost) ../modules/hosts)
+      ++ (lib.optional useHomeManager (
+        if darwinHost then
+          inputs.home-manager.darwinModules.home-manager
+        else
+          inputs.home-manager.nixosModules.home-manager
+      ))
+      ++ extraModules;
     in
     builder {
       system = system;