Merge pull request #23 from Kranzes/flake-parts-refactor

nix: refactor and start using flake-parts

Author: Mic92

docs/default.nix

@@ -0,0 +1,15 @@
+{
+  perSystem = { pkgs, lib, ... }: {
+    packages.docs = pkgs.runCommand "nixos-remote-docs"
+      {
+        passthru.serve = pkgs.writeShellScriptBin "serve" ''
+          cd docs
+          ${lib.getExe pkgs.mdbook} serve --dest-dir $(${pkgs.coreutils}/bin/mktemp -d)
+        '';
+      }
+      ''
+        cp -r ${lib.cleanSource ./.}/* .
+        ${lib.getExe pkgs.mdbook} build --dest-dir "$out"
+      '';
+  };
+}

docs/flake-module.nix

@@ -1,44 +1,22 @@
 {
   description = "A universal nixos installer, just needs ssh access to the target system";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-  inputs.disko.url = "github:nix-community/disko/master";
-  inputs.disko.inputs.nixpkgs.follows = "nixpkgs";
-  # used for testing
-  inputs.nixos-images.url = "github:nix-community/nixos-images";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    flake-parts = { url = "github:hercules-ci/flake-parts"; inputs.nixpkgs-lib.follows = "nixpkgs"; };
+    disko = { url = "github:nix-community/disko/master"; inputs.nixpkgs.follows = "nixpkgs"; };
+    # used for testing
+    nixos-images.url = "github:nix-community/nixos-images";
+  };
 
-  outputs = { self, disko, nixpkgs, nixos-images, ... }:
-    let
-      supportedSystems = [
-        "x86_64-linux"
-        "i686-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
+
+  outputs = inputs:
+    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
+      systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
+      imports = [
+        ./src/flake-module.nix
+        ./tests/flake-module.nix
+        ./docs/flake-module.nix
       ];
-      forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-    in
-    {
-      packages = forAllSystems (system:
-        let pkgs = nixpkgs.legacyPackages.${system}; in
-        {
-          default = self.packages.${system}.nixos-remote;
-          docs = pkgs.callPackage ./docs { };
-          nixos-remote = pkgs.callPackage ./src { };
-        });
-      checks.x86_64-linux =
-        let
-          pkgs = nixpkgs.legacyPackages.x86_64-linux;
-          inputs = {
-            inherit pkgs;
-            inherit (disko.nixosModules) disko;
-            nixos-remote = self.packages.x86_64-linux.nixos-remote;
-            kexec-installer = "${nixos-images.packages.${pkgs.system}.kexec-installer-nixos-unstable}/nixos-kexec-installer-${pkgs.stdenv.hostPlatform.system}.tar.gz";
-          };
-        in
-        {
-          from-nixos = import ./tests/from-nixos.nix inputs;
-          from-nixos-with-sudo = import ./tests/from-nixos-with-sudo.nix inputs;
-        };
     };
 }

flake.lock

@@ -0,0 +1,8 @@
+{
+  perSystem = { pkgs, ... }: {
+    packages = rec {
+      nixos-remote = pkgs.callPackage ./. { };
+      default = nixos-remote;
+    };
+  };
+}

flake.nix

@@ -0,0 +1,17 @@
+{ withSystem, inputs, ... }:
+
+{
+  flake.checks.x86_64-linux = withSystem "x86_64-linux" ({ pkgs, system, inputs', config, ... }:
+    let
+      testInputs = {
+        inherit pkgs;
+        inherit (inputs.disko.nixosModules) disko;
+        nixos-remote = config.packages.nixos-remote;
+        kexec-installer = "${inputs'.nixos-images.packages.kexec-installer-nixos-unstable}/nixos-kexec-installer-${system}.tar.gz";
+      };
+    in
+    {
+      from-nixos = import ./from-nixos.nix testInputs;
+      from-nixos-with-sudo = import ./from-nixos-with-sudo.nix testInputs;
+    });
+}