diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..1d953f4
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/.gitignore b/.gitignore
index 749471d..ba7a367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ obj
 .idea
 client
 *.sarif
+.direnv
 
diff --git a/shell.nix b/shell.nix
new file mode 100644
index 0000000..0555690
--- /dev/null
+++ b/shell.nix
@@ -0,0 +1,11 @@
+{pkgs ? import <nixpkgs> {}}:
+pkgs.mkShell {
+  nativeBuildInputs = with pkgs.buildPackages; [
+    rustup
+    pkg-config
+    xe
+    lzma
+    cargo-tarpaulin
+    gnumake
+  ];
+}
diff --git a/tanks-backend/TanksServer.sln b/tanks-backend/TanksServer.sln
index a3b976e..01b194e 100644
--- a/tanks-backend/TanksServer.sln
+++ b/tanks-backend/TanksServer.sln
@@ -5,6 +5,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{12DB7D48-1BB2-488B-B4D9-4126087D2F8C}"
 	ProjectSection(SolutionItems) = preProject
 		Dockerfile = Dockerfile
+		..\shell.nix = ..\shell.nix
+		..\.envrc = ..\.envrc
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServicePoint", "servicepoint/crates/servicepoint_binding_cs/ServicePoint/ServicePoint.csproj", "{DFCC69ED-E02B-4631-8A23-5D394BA01E03}"
diff --git a/tanks-backend/servicepoint b/tanks-backend/servicepoint
index 084c3df..ff71369 160000
--- a/tanks-backend/servicepoint
+++ b/tanks-backend/servicepoint
@@ -1 +1 @@
-Subproject commit 084c3df1db204d619932338c4b1347cc9d32f590
+Subproject commit ff713690e3799eaaf7aed5ec5ac557cc91d96178