feat: refine nix integration with development

LagrangeDev · Feb 6, 2025 · b0e1472 · b0e1472
1 parent 1c03f3e
commit b0e1472
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 4 deletions.
diff --git a/.envrc b/.envrc
@@ -1 +1,5 @@
-use flake
+watch_file flake.lock
+watch_file rust-toolchain.toml
+
+use flake || use nix
+eval "$shellHook"
diff --git a/default.nix b/default.nix
@@ -0,0 +1,12 @@
+# use flake's packages.default for non-flake-enabled nix instances
+let
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  nodeName = lock.nodes.root.inputs.flake-compat;
+  compat = fetchTarball {
+    url =
+      lock.nodes.${nodeName}.locked.url
+        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
+    sha256 = lock.nodes.${nodeName}.locked.narHash;
+  };
+in
+(import compat { src = ./.; }).defaultNix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,6 +16,9 @@
       url = "github:rustsec/advisory-db";
       flake = false;
     };
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+    };
   };
 
   outputs =
@@ -148,11 +151,14 @@
           );
         };
         devShells.default = pkgs.mkShell {
+          inputsFrom = builtins.attrValues self.checks."${system}";
           packages = with pkgs; [
-            (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
             rust-analyzer
+            cargo-flamegraph
+            cargo-tarpaulin
+            lldb
           ];
-          nativeBuildInputs = with pkgs; [ protobuf ];
+          shellHook = '''';
         };
       }
     )
@@ -161,5 +167,4 @@
         inherit (self.packages."${final.system}") mania;
       };
     };
-
 }
diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,12 @@
+# use flake's devShells.default for non-flake-enabled nix instances
+let
+  lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+  nodeName = lock.nodes.root.inputs.flake-compat;
+  compat = fetchTarball {
+    url =
+      lock.nodes.${nodeName}.locked.url
+        or "https://github.com/edolstra/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
+    sha256 = lock.nodes.${nodeName}.locked.narHash;
+  };
+in
+(import compat { src = ./.; }).shellNix.default