diff --git a/provision/flake.nix b/provision/flake.nix
index b60df1b0..40ef580f 100644
--- a/provision/flake.nix
+++ b/provision/flake.nix
@@ -20,13 +20,25 @@
     lib = nixpkgs.lib;
   in {
     nixosConfigurations = lib.mapAttrs (hostname: hostConfig:
-      lib.nixosSystem (import ./hosts/${hostConfig.role} {
-        inherit lib;
-        inherit system inputs agenix home-manager jovian-nixos nixos-wsl nix-flatpak;
+      lib.nixosSystem ({
         specialArgs = {
+          inherit lib system inputs agenix home-manager jovian-nixos nixos-wsl nix-flatpak;
           user = hostConfig.user;
           hostname = "${hostname}";
         };
+        modules = [
+          ./hosts/${hostConfig.role}/configuration.nix
+          ./modules
+          agenix.nixosModules.default
+          nix-flatpak.nixosModules.nix-flatpak
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            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]);
       })
     ) hosts;
   };
diff --git a/provision/hosts/bulwark/default.nix b/provision/hosts/bulwark/default.nix
deleted file mode 100644
index eead2488..00000000
--- a/provision/hosts/bulwark/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, specialArgs, system, inputs, agenix, home-manager, jovian-nixos, nix-flatpak, ... }:
-let
-    user = specialArgs.user; 
-    hostname = specialArgs.hostname;
-in { 
-  inherit system;
-  specialArgs = { inherit user hostname inputs home-manager jovian-nixos nix-flatpak; };
-  modules = [
-    ./configuration.nix
-    ./hardware.nix
-    ../../modules
-    agenix.nixosModules.default
-    nix-flatpak.nixosModules.nix-flatpak
-    home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = { inherit user; };
-    }
-  ];
-}
diff --git a/provision/hosts/htpc/default.nix b/provision/hosts/htpc/default.nix
deleted file mode 100644
index 7425d09a..00000000
--- a/provision/hosts/htpc/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
-let
-    user = specialArgs.user; 
-    hostname = specialArgs.hostname;
-in { 
-  inherit system;
-  specialArgs = { inherit user hostname inputs home-manager nix-flatpak; };
-  modules = [
-    ./configuration.nix
-    ../../modules
-    /etc/nixos/hardware-configuration.nix
-    agenix.nixosModules.default
-    nix-flatpak.nixosModules.nix-flatpak
-    home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = { inherit user; };
-    }
-  ];
-}
diff --git a/provision/hosts/kestrel/default.nix b/provision/hosts/kestrel/default.nix
deleted file mode 100644
index 3c5e7808..00000000
--- a/provision/hosts/kestrel/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
-let
-    user = specialArgs.user; 
-    hostname = specialArgs.hostname;
-in { 
-  inherit system;
-  specialArgs = { inherit user hostname inputs home-manager nix-flatpak; };
-  modules = [
-    ./configuration.nix
-    ./hardware.nix
-    ../../modules
-    agenix.nixosModules.default
-    nix-flatpak.nixosModules.nix-flatpak
-    home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = { inherit user; };
-    }
-  ];
-}
diff --git a/provision/hosts/shivan/default.nix b/provision/hosts/shivan/default.nix
deleted file mode 100644
index 27a9cbef..00000000
--- a/provision/hosts/shivan/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
-let
-    user = specialArgs.user; 
-    hostname = specialArgs.hostname;
-in { 
-  inherit system;
-  specialArgs = { inherit user inputs home-manager nix-flatpak; };
-  modules = [
-    ./configuration.nix
-    ./hardware.nix
-    ../../modules
-    agenix.nixosModules.default
-    nix-flatpak.nixosModules.nix-flatpak
-    home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = { inherit user; };
-    }
-  ];
-}
diff --git a/provision/hosts/torus/default.nix b/provision/hosts/torus/default.nix
deleted file mode 100644
index 3c5e7808..00000000
--- a/provision/hosts/torus/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, specialArgs, system, inputs, agenix, home-manager, nix-flatpak, ... }:
-let
-    user = specialArgs.user; 
-    hostname = specialArgs.hostname;
-in { 
-  inherit system;
-  specialArgs = { inherit user hostname inputs home-manager nix-flatpak; };
-  modules = [
-    ./configuration.nix
-    ./hardware.nix
-    ../../modules
-    agenix.nixosModules.default
-    nix-flatpak.nixosModules.nix-flatpak
-    home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = { inherit user; };
-    }
-  ];
-}
diff --git a/provision/hosts/wsl/default.nix b/provision/hosts/wsl/default.nix
deleted file mode 100644
index 216c7d6a..00000000
--- a/provision/hosts/wsl/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, specialArgs, system, inputs, agenix, home-manager, nixos-wsl, ... }:
-let
-    user = specialArgs.user; 
-    hostname = specialArgs.hostname;
-in { 
-  inherit system;
-  specialArgs = { inherit user hostname inputs nixos-wsl home-manager; };
-  modules = [
-    ./configuration.nix
-    ../../modules
-    agenix.nixosModules.default
-    home-manager.nixosModules.home-manager {
-      home-manager.useGlobalPkgs = true;
-      home-manager.useUserPackages = true;
-      home-manager.extraSpecialArgs = { inherit user; };
-    }
-  ];
-}