build(flake): split into flake modules

flake.nix

@@ -16,7 +16,6 @@
 
   outputs = inputs @ {
     flake-parts,
-    crate2nix,
     rust-overlay,
     ...
   }:
@@ -28,33 +27,22 @@
         "x86_64-linux"
       ];
 
+      imports = [
+        ./nix/wasm-bindgen.nix
+        ./nix/wordle-solver.nix
+        ./nix/wordle-solver-wasm.nix
+        ./nix/wordle-solver-wasm-pkg.nix
+        ./nix/wordle-solver-web.nix
+      ];
+
       perSystem = {
         pkgs,
         system,
         self',
         ...
       }: let
-        # Use rust-bin to generate the toolchain from rust-toolchain.toml
+        utils = import ./nix/utils.nix;
-        rust-toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+        rust-toolchain = utils.rust-toolchain pkgs;
-
-        cross-pkgs = pkgs.pkgsCross.wasm32-unknown-none;
-
-        toolchain = pkgs.callPackage ./nix/with-toolchain.nix {
-          cargo = rust-toolchain;
-          rustc = rust-toolchain;
-        };
-        crossToolchain = cross-pkgs.callPackage ./nix/with-toolchain.nix {
-          cargo = rust-toolchain;
-          rustc = rust-toolchain;
-        };
-
-        wasm-bindgen = toolchain.pkgs.callPackage ./nix/wasm-bindgen.nix {};
-
-        root-crate = pkgs.callPackage ./nix/root-crate.nix {
-          cargo = rust-toolchain;
-          rustc = rust-toolchain;
-          inherit crate2nix;
-        };
       in {
         # Overlay pkgs with rust-bin
         _module.args.pkgs = import inputs.nixpkgs {
@@ -63,22 +51,13 @@
           config.allowUnsupportedSystem = true;
         };
 
-        packages = {
+        packages.default = self'.packages.wordle-solver;
-          wordle-solver-web = pkgs.callPackage ./nix/wordle-solver-web.nix {inherit (self'.packages) wordle-solver-wasm-pkg;};
-          wordle-solver-wasm = crossToolchain.pkgs.callPackage ./nix/wordle-solver-wasm.nix {};
-          wordle-solver-wasm-pkg = pkgs.callPackage ./nix/wordle-solver-wasm-pkg.nix {
-            inherit wasm-bindgen root-crate;
-            inherit (self'.packages) wordle-solver-wasm;
-          };
-          wordle-solver = root-crate.build;
-          default = self'.packages.wordle-solver;
-        };
 
         devShells.default = pkgs.mkShell {
           RA_LOG = "rust_analyzer=info";
           buildInputs = [
             rust-toolchain
-            wasm-bindgen
+            self'.packages.wasm-bindgen
             pkgs.nodejs
             pkgs.svelte-language-server
             pkgs.typescript-language-server

nix/root-crate.nix

@@ -1,23 +0,0 @@
-{
-  crate2nix,
-  rustc,
-  cargo,
-  pkgs,
-  ...
-}: let
-  buildRustCrateForPkgs = _:
-    pkgs.buildRustCrate.override {
-      inherit cargo rustc;
-    };
-
-  # Cargo.nix for IFD
-  generatedCargoNix = crate2nix.tools.${pkgs.hostPlatform.system}.generatedCargoNix {
-    name = "rustnix";
-    src = ../.;
-  };
-
-  cargoNix = import generatedCargoNix {
-    inherit pkgs buildRustCrateForPkgs;
-  };
-in
-  cargoNix.rootCrate

nix/utils.nix

@@ -0,0 +1,21 @@
+rec {
+  rust-toolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ../rust-toolchain.toml;
+
+  toolchain-pkgs = pkgs:
+    pkgs.extend (_: _: {
+      rustPlatform = pkgs.makeRustPlatform {
+        cargo = rust-toolchain pkgs;
+        rustc = rust-toolchain pkgs;
+      };
+    });
+
+  toolchain-crosspkgs = pkgs: let
+    crossPkgs = pkgs.pkgsCross.wasm32-unknown-none;
+  in
+    crossPkgs.extend (_: _: {
+      rustPlatform = crossPkgs.makeRustPlatform {
+        cargo = rust-toolchain pkgs;
+        rustc = rust-toolchain pkgs;
+      };
+    });
+}

nix/wasm-bindgen.nix

@@ -1,10 +1,11 @@
-{
+let
+  drv = {
     fetchCrate,
     buildWasmBindgenCli,
     rustPlatform,
     ...
-}:
+  }:
-buildWasmBindgenCli rec {
+    buildWasmBindgenCli rec {
       src = fetchCrate {
         pname = "wasm-bindgen-cli";
         version = "0.2.127";
@@ -16,4 +17,11 @@ buildWasmBindgenCli rec {
         inherit (src) pname version;
         hash = "sha256-FTv2GZIAQs0ePdIZXIXil7JbZ6kIT05VG6vqC1qNFxQ=";
       };
+    };
+
+  utils = import ./utils.nix;
+in {
+  perSystem = {pkgs, ...}: {
+    packages.wasm-bindgen = (utils.toolchain-pkgs pkgs).callPackage drv {};
+  };
 }

nix/with-toolchain.nix

@@ -1,16 +0,0 @@
-{
-  makeRustPlatform,
-  cargo,
-  rustc,
-  pkgs,
-  ...
-}: let
-  p = pkgs;
-in rec {
-  rustPlatform = makeRustPlatform {
-    inherit cargo rustc;
-  };
-  pkgs = p.extend (_: _: {
-    inherit rustPlatform;
-  });
-}

nix/wordle-solver-wasm-pkg.nix

@@ -1,16 +1,21 @@
 {
+  perSystem = {
+    pkgs,
+    self',
+    ...
+  }: let
+    drv = {
       stdenvNoCC,
       wasm-bindgen,
       wordle-solver-wasm,
-  root-crate,
       ...
-}: let
+    }: let
       snake_name = "wordle_solver";
       package-meta = {
         name = "wordle-solver";
         type = "module";
         description = "module";
-    version = root-crate.build.crateVersion;
+        version = "0.1.0";
         files = [
           "${snake_name}_bg.wasm"
           "${snake_name}.js"
@@ -25,7 +30,7 @@
         ];
       };
       package-json = builtins.toJSON package-meta;
-in
+    in
       stdenvNoCC.mkDerivation {
         name = "wordle-solver-wasm-pkg";
         nativeBuildInputs = [wasm-bindgen];
@@ -36,4 +41,10 @@ in
           ${package-json}
           EOF
         '';
-  }
+      };
+  in {
+    packages.wordle-solver-wasm-pkg = pkgs.callPackage drv {
+      inherit (self'.packages) wordle-solver-wasm wasm-bindgen;
+    };
+  };
+}

nix/wordle-solver-wasm.nix

@@ -1,11 +1,15 @@
 {
+  perSystem = {pkgs, ...}: let
+    utils = import ./utils.nix;
+    toolchain-crosspkgs = utils.toolchain-crosspkgs pkgs;
+    drv = {
       rustPlatform,
       buildPackages,
       lld,
       name ? "wordle-solver",
       ...
-}:
+    }:
-rustPlatform.buildRustPackage {
+      rustPlatform.buildRustPackage {
         inherit name;
 
         src = ../.; # Or your source location
@@ -36,4 +40,8 @@ rustPlatform.buildRustPackage {
           mkdir -p $out/lib
           cp target/wasm32-unknown-unknown/release/*.wasm $out/lib/
         '';
+      };
+  in {
+    packages.wordle-solver-wasm = toolchain-crosspkgs.callPackage drv {};
+  };
 }

nix/wordle-solver-web.nix

@@ -1,12 +1,18 @@
 {
+  perSystem = {
+    pkgs,
+    self',
+    ...
+  }: let
+    drv = {
       stdenv,
       fetchYarnDeps,
       yarnConfigHook,
       yarnBuildHook,
       nodejs,
       wordle-solver-wasm-pkg,
-}:
+    }:
-stdenv.mkDerivation (finalAttrs: {
+      stdenv.mkDerivation (finalAttrs: {
         pname = "wordle-solver-web";
         version = "0.1.0";
 
@@ -34,4 +40,10 @@ stdenv.mkDerivation (finalAttrs: {
           # Needed for executing package.json scripts
           nodejs
         ];
-})
+      });
+  in {
+    packages.wordle-solver-web = pkgs.callPackage drv {
+      inherit (self'.packages) wordle-solver-wasm-pkg;
+    };
+  };
+}

nix/wordle-solver.nix

@@ -0,0 +1,27 @@
+{inputs, ...}: {
+  perSystem = {pkgs, ...}: let
+    # Cargo.nix for IFD
+    generatedCargoNix = inputs.crate2nix.tools.${pkgs.hostPlatform.system}.generatedCargoNix {
+      name = "rustnix";
+      src = ../.;
+    };
+
+    utils = import ./utils.nix;
+
+    rust-toolchain = utils.rust-toolchain pkgs;
+    toolchain-pkgs = utils.toolchain-pkgs pkgs;
+
+    buildRustCrateForPkgs = _:
+      pkgs.buildRustCrate.override {
+        cargo = rust-toolchain;
+        rustc = rust-toolchain;
+      };
+
+    cargoNix = import generatedCargoNix {
+      pkgs = toolchain-pkgs;
+      inherit buildRustCrateForPkgs;
+    };
+  in {
+    packages.wordle-solver = cargoNix.rootCrate.build;
+  };
+}