From 2265ae8eac9b9c4a984ce666c4f28241145242c1 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Mon, 7 Oct 2024 21:42:46 -0500
Subject: [PATCH 1/2] spotlights-macbook-air: Migrate to Darwin subdirectory

There's also a `spotlights-macbook-air` under NixOS, and it would be preferable to eventually have it in-tree.
---
 flake.nix                                                   | 2 +-
 hosts/{ => darwin}/spotlights-macbook-air/configuration.nix | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename hosts/{ => darwin}/spotlights-macbook-air/configuration.nix (100%)

diff --git a/flake.nix b/flake.nix
index 372db3b..977ddf7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -135,7 +135,7 @@
       darwinConfigurations."spotlights-macbook-air" = nix-darwin.lib.darwinSystem {
         modules = [
           # System-wide configuration
-          ./hosts/spotlights-macbook-air/configuration.nix
+          ./hosts/darwin/spotlights-macbook-air/configuration.nix
           # Our provided home-manager configuration
           home-manager.darwinModules.home-manager
           {
diff --git a/hosts/spotlights-macbook-air/configuration.nix b/hosts/darwin/spotlights-macbook-air/configuration.nix
similarity index 100%
rename from hosts/spotlights-macbook-air/configuration.nix
rename to hosts/darwin/spotlights-macbook-air/configuration.nix

From 1d5090762b9c65d3740a75b9aa97978f804110ef Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Mon, 7 Oct 2024 21:46:30 -0500
Subject: [PATCH 2/2] cyclone: Migrate to Linux subdirectory

---
 flake.nix                                            | 3 +--
 hosts/{ => linux}/cyclone/README.md                  | 0
 hosts/{ => linux}/cyclone/configuration.nix          | 4 ++++
 hosts/{ => linux}/cyclone/hardware-configuration.nix | 0
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename hosts/{ => linux}/cyclone/README.md (100%)
 rename hosts/{ => linux}/cyclone/configuration.nix (98%)
 rename hosts/{ => linux}/cyclone/hardware-configuration.nix (100%)

diff --git a/flake.nix b/flake.nix
index 977ddf7..e796428 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,8 +114,7 @@
       # We define a NixOS configuration for a PC workstation.
       nixosConfigurations.cyclone = nixpkgs.lib.nixosSystem {
         modules = [
-          ./hosts/cyclone/configuration.nix
-          ./hosts/cyclone/hardware-configuration.nix
+          ./hosts/linux/cyclone/configuration.nix
 
           vscode-server.nixosModules.default
           home-manager.nixosModules.home-manager
diff --git a/hosts/cyclone/README.md b/hosts/linux/cyclone/README.md
similarity index 100%
rename from hosts/cyclone/README.md
rename to hosts/linux/cyclone/README.md
diff --git a/hosts/cyclone/configuration.nix b/hosts/linux/cyclone/configuration.nix
similarity index 98%
rename from hosts/cyclone/configuration.nix
rename to hosts/linux/cyclone/configuration.nix
index e5ee700..7be0f2d 100644
--- a/hosts/cyclone/configuration.nix
+++ b/hosts/linux/cyclone/configuration.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
 
 {
+  imports = [
+    ./hardware-configuration.nix
+  ]
+
   networking = {
     hostName = "cyclone";
     domain = "host.fox-int.cloud";
diff --git a/hosts/cyclone/hardware-configuration.nix b/hosts/linux/cyclone/hardware-configuration.nix
similarity index 100%
rename from hosts/cyclone/hardware-configuration.nix
rename to hosts/linux/cyclone/hardware-configuration.nix