flake cleanup

demostf · Nov 24, 2024 · b9b7490 · b9b7490
1 parent 96907a8
commit b9b7490
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 214 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,7 +35,7 @@
       (final: prev: {
         demostf-frontend-toolchain = final.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
       })
-      (import ./overlay.nix)
+      (import ./nix/overlay.nix)
     ];
     toolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
     tools = pkgs: with pkgs; [

diff --git a/flake_.nix b/flake_.nix
diff --git a/module.nix b/module.nix
diff --git a/node_modules.nix → nix/node_modules.nix b/node_modules.nix → nix/node_modules.nix
@@ -7,6 +7,6 @@ let
   inherit (lib.sources) sourceByRegex;
 in
 npmlock2nix.v2.node_modules {
-  src = sourceByRegex ./. [ "package.*" ];
+  src = sourceByRegex ../. [ "package.*" ];
   nodejs = nodejs_20;
 }
diff --git a/overlay.nix → nix/overlay.nix b/overlay.nix → nix/overlay.nix
diff --git a/package.nix → nix/package.nix b/package.nix → nix/package.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   pname = "demostf-frontend";
   version = "0.1.0";
 
-  src = sourceByRegex ./. [ "Cargo.*" "(src|build|images|script|style|.sqlx)(/.*)?" ];
+  src = sourceByRegex ../. [ "Cargo.*" "(src|build|images|script|style|.sqlx)(/.*)?" ];
 
   buildInputs = [ openssl ];
 
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   doCheck = false;
 
   cargoLock = {
-    lockFile = ./Cargo.lock;
+    lockFile = ../Cargo.lock;
     outputHashes = {
       "jsx-dom-expressions-0.1.0" = "sha256-5TN9FBfPYznTkpL9ZtnKv3RghX7r8c2WvSL1sc+F0cw=";
     };