move nixinate to own flake

1 files changed, 30 insertions, 44 deletions

diff --git a/flake.nix b/flake.nix
index 4746c2e..3418c82 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,53 +2,39 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
     flake-parts.url = "github:hercules-ci/flake-parts";
+    nixinate.url = "github:maxaudron/nixinate";
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } ({ withSystem, flake-parts-lib, ... }:
-      let
-        inherit (flake-parts-lib) importApply;
-        flakeModules.nixinate = importApply ./nixinate { inherit withSystem; };
-      in
-      {
-        imports = [
-          flakeModules.nixinate
-        ];
-        flake =
-          let
-            specialArgs = inputs // { inherit inputs; };
-            system = "x86_64-linux";
-          in
-          {
-            inherit flakeModules;
-            nixosConfigurations = {
-              nixos-test = nixpkgs.lib.nixosSystem {
-                system = system;
-                specialArgs = specialArgs // { inherit system; };
-                modules = [
-                  (import ./machines/nixos-test)
+  outputs = inputs@{ self, nixpkgs, flake-parts, nixinate, ... }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      imports = [ nixinate.flakeModule ];
+      flake =
+        let
+          system = "x86_64-linux";
+          specialArgs = inputs // { inherit system; };
+        in
+        {
+          nixosConfigurations = {
+            nixos-test = nixpkgs.lib.nixosSystem {
+              inherit specialArgs system;
+              modules = [
+                (import ./machines/nixos-test)
 
-                  (import ./modules)
-                  (import ./modules/users)
-                  {
-                    _module.args.nixinate = {
-                      host = "10.49.212.3";
-                      sshUser = "audron";
-                      buildOn = "remote";
-                      substituteOnTarget = true;
-                      hermetic = false;
-                    };
-                  }
-                ];
-              };
+                (import ./modules)
+                (import ./modules/users)
+                {
+                  _module.args.nixinate = {
+                    host = "10.49.212.3";
+                    sshUser = "audron";
+                    buildOn = "remote";
+                    substituteOnTarget = true;
+                    hermetic = false;
+                  };
+                }
+              ];
             };
           };
-        systems = [
-          "x86_64-linux"
-          "x86_64-darwin"
-          "aarch64-linux"
-          "aarch64-darwin"
-        ];
-        perSystem = { config, ... }: { };
-      });
+        };
+      systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+    };
 }