flake-parts: hosts

2 files changed, 27 insertions, 18 deletions

diff --git a/flake.nix b/flake.nix
index da5ac30..6682140 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,9 +83,6 @@
       nixpkgs,
       home-manager,
       systems,
-      nix-index-database,
-      pia,
-      nur,
       pre-commit-hooks,
       chaotic,
       flake-parts,
@@ -101,6 +98,7 @@
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = builtins.attrNames (forAllSystems (system: system));
+      imports = [ ./hosts ];
 
       perSystem =
         { system, ... }:
@@ -128,21 +126,6 @@
       flake = {
         inherit lib;
 
-        nixosConfigurations.kansai = lib.nixosSystem {
-          specialArgs = {
-            inherit inputs outputs secrets;
-          };
-
-          modules = [
-            home-manager.nixosModule
-            pia.nixosModule
-            nix-index-database.nixosModules.nix-index
-            nur.nixosModules.nur
-            chaotic.nixosModules.default
-            ./hosts/kansai
-          ];
-        };
-
         homeConfigurations.ebisu =
           let
             username = "ebisu";
diff --git a/hosts/default.nix b/hosts/default.nix
new file mode 100644
index 0000000..266d30c
--- /dev/null
+++ b/hosts/default.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  inputs,
+  outputs,
+  self,
+  ...
+}:
+let
+  secrets = builtins.fromTOML (builtins.readFile "${self}/secrets/secrets.toml");
+in
+{
+  flake.nixosConfigurations.kansai = lib.nixosSystem {
+    specialArgs = {
+      inherit inputs outputs secrets;
+    };
+
+    modules = [
+      inputs.home-manager.nixosModule
+      inputs.pia.nixosModule
+      inputs.nix-index-database.nixosModules.nix-index
+      inputs.nur.nixosModules.nur
+      inputs.chaotic.nixosModules.default
+      ./kansai
+    ];
+  };
+}