From 7de88ba2b6a39d7e2285b0b87ea7e39a16bc8353 Mon Sep 17 00:00:00 2001
From: Noah Masur <7386960+nmasur@users.noreply.github.com>
Date: Sun, 16 Feb 2025 16:33:32 -0500
Subject: [PATCH] fixing hosts

---
 flake.nix                |  4 ++--
 hosts/darwin/default.nix | 16 ----------------
 hosts/default.nix        | 31 +++++++++++++++++++++++++++++--
 hosts/nixos/default.nix  | 20 --------------------
 4 files changed, 31 insertions(+), 40 deletions(-)
 delete mode 100644 hosts/darwin/default.nix
 delete mode 100644 hosts/nixos/default.nix

diff --git a/flake.nix b/flake.nix
index 038c19e..4ed905a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -320,8 +320,8 @@
       # Create nixosConfigurations using the different pkgs for each system
       # What to do with home config?
 
-      nixosModules = import ./hosts/nixos nixpkgs;
-      darwinModules = import ./hosts/darwin nixpkgs;
+      nixosModules = (import ./hosts nixpkgs).nixos-hosts;
+      darwinModules = (import ./hosts nixpkgs).darwin-hosts;
 
       # Contains my full system builds, including home-manager
       # nixos-rebuild switch --flake .#tempest
diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix
deleted file mode 100644
index 2303757..0000000
--- a/hosts/darwin/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# Return a list of all nix-darwin hosts
-
-{ lib, ... }:
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]
diff --git a/hosts/default.nix b/hosts/default.nix
index 1b63d3b..312388a 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -1,6 +1,33 @@
 # Return a list of all hosts
 
+nixpkgs:
+
+let
+  inherit (nixpkgs) lib;
+in
+
 {
-  darwin-hosts = import ./darwin;
-  linux-hosts = import ./nixos;
+  # darwin-hosts = import ./darwin;
+  darwin-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./darwin) [
+    # Get only files ending in default.nix
+    (builtins.filter (name: lib.hasSuffix "default.nix" name))
+    # Import each host function
+    (map (file: {
+      name = builtins.baseNameOf (builtins.dirOf file);
+      value = import file;
+    }))
+    # Convert to an attrset of hostname -> host function
+    (builtins.listToAttrs)
+  ];
+  nixos-hosts = lib.pipe (lib.filesystem.listFilesRecursive ./nixos) [
+    # Get only files ending in default.nix
+    (builtins.filter (name: lib.hasSuffix "default.nix" name))
+    # Import each host function
+    (map (file: {
+      name = builtins.baseNameOf (builtins.dirOf file);
+      value = import file;
+    }))
+    # Convert to an attrset of hostname -> host function
+    (builtins.listToAttrs)
+  ];
 }
diff --git a/hosts/nixos/default.nix b/hosts/nixos/default.nix
deleted file mode 100644
index 24b0b2f..0000000
--- a/hosts/nixos/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# Return a list of all NixOS hosts
-
-{ nixpkgs, ... }:
-
-let
-  inherit (nixpkgs) lib;
-in
-
-lib.pipe (lib.filesystem.listFilesRecursive ./.) [
-  # Get only files ending in default.nix
-  (builtins.filter (name: lib.hasSuffix "default.nix" name))
-  # Import each host function
-  map
-  (file: {
-    name = builtins.baseNameOf (builtins.dirOf file);
-    value = import file;
-  })
-  # Convert to an attrset of hostname -> host function
-  (builtins.listToAttrs)
-]