From 802b998bfde15483479c041ac5484b68ee306d16 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Sun, 22 Jun 2025 22:02:09 -0700
Subject: [PATCH] fix flake and roles in json

---
 provision/flake.nix  | 7 +++----
 provision/hosts.json | 7 -------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/provision/flake.nix b/provision/flake.nix
index 40ef580f..47f2a6b3 100644
--- a/provision/flake.nix
+++ b/provision/flake.nix
@@ -27,7 +27,7 @@
           hostname = "${hostname}";
         };
         modules = [
-          ./hosts/${hostConfig.role}/configuration.nix
+          ./hosts/${hostname}/configuration.nix
           ./modules
           agenix.nixosModules.default
           nix-flatpak.nixosModules.nix-flatpak
@@ -36,9 +36,8 @@
             home-manager.useUserPackages = true;
             home-manager.extraSpecialArgs = { user = hostConfig.user; };
           }
-        ] ++ (if "${hostConfig.role}" == "htpc" then [/etc/nixos/hardware-configuration.nix]
-              else if "${hostConfig.role}" == "wsl" then []
-              else [./hosts/${hostConfig.role}/hardware.nix]);
+        ] ++ (if "${hostname}" == "wsl" then []
+              else [./hosts/${hostname}/hardware.nix]);
       })
     ) hosts;
   };
diff --git a/provision/hosts.json b/provision/hosts.json
index 95ca0648..1daef743 100644
--- a/provision/hosts.json
+++ b/provision/hosts.json
@@ -1,30 +1,23 @@
 {
   "kestrel": {
-    "role": "kestrel",
     "user": "tstarr"
   },
   "shivan": {
-    "role": "shivan",
     "user": "tstarr"
   },
   "torus": {
-    "role": "torus",
     "user": "tstarr"
   },
   "bulwark": {
-    "role": "bulwark",
     "user": "tstarr"
   },
   "osprey": {
-    "role": "osprey",
     "user": "tstarr"
   },
   "wsl": {
-    "role": "wsl",
     "user": "dev"
   },
   "htpc-bako": {
-    "role": "htpc",
     "user": "starr"
   }
 }