From 4e4dbf52ecd405bd1f84245b9258fa323fdae89a Mon Sep 17 00:00:00 2001
From: Arbion Halili <99731180+ToxicPine@users.noreply.github.com>
Date: Mon, 14 Jul 2025 21:08:43 +0100
Subject: [PATCH] fix: Use Nix-compatible LSP set-up

---
 .vscode/extensions.json | 11 +++++++++++
 .vscode/settings.json   |  3 +++
 flake.nix               |  1 +
 justfile                |  2 +-
 pyproject.toml          |  1 -
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/extensions.json
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..3dfc2a75
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,11 @@
+{
+    "recommendations": [
+        "detachhead.basedpyright",
+        "ms-python.python"
+    ],
+    "unwantedRecommendations": [
+        "ms-python.vscode-pylance",
+        "ms-python.pyright",
+        "ms-python.mypy-type-checker"
+    ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..31682d35
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "basedpyright.importStrategy": "fromEnvironment"
+}
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 4ad5a219..a97b3f63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,7 @@
               pkgs.protobuf
               pkgs.rustc
               pkgs.cargo
+              pkgs.basedpyright
             ];
           };
         }
diff --git a/justfile b/justfile
index fdffc979..04be3380 100644
--- a/justfile
+++ b/justfile
@@ -20,7 +20,7 @@ test:
     uv run pytest master worker shared engines/*
 
 check:
-    uv run basedpyright --project pyproject.toml
+    basedpyright --project pyproject.toml
 
 sync:
     uv sync --all-packages
diff --git a/pyproject.toml b/pyproject.toml
index 73dca1bf..c9bacb5a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,6 @@ dependencies = [
 # dependencies only required for development
 [dependency-groups]
 dev = [
-    "basedpyright>=1.29.4",
     "maturin>=1.9.0",
     "pytest>=8.4.0",
     "ruff>=0.11.13",