1 files changed, 15 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index bbf4f94..2a94447 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,11 +46,23 @@
           }
         )
         systems);
+    buildSystem = file: system:
+      inputs.nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = {inherit inputs;};
+        modules = [
+          options
+          ./home
+          ./modules
+          ./system
+          file
+        ];
+      };
   in rec {
     nixosConfigurations = {
-      shinji = import ./hosts/shinji {inherit inputs options;};
-      kaworu = import ./hosts/kaworu {inherit inputs options;};
-      thinkpad = import ./hosts/thinkpad {inherit inputs options;};
+      shinji = buildSystem ./hosts/shinji "x86_64-linux";
+      kaworu = buildSystem ./hosts/kaworu "x86_64-linux";
+      thinkpad = buildSystem ./hosts/thinkpad "x86_64-linux";
     };
 
     homeConfigurations = {