diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index cedc387..743b006 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
     "recommendations": [
-        "ms-python.black-formatter",
+        "charliermarsh.ruff",
         "ms-python.python",
         "ms-python.vscode-pylance",
         "ms-python.debugpy",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c23f1c0..a62ba18 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,9 +6,14 @@
     "python.testing.pytestEnabled": true,
     "python.analysis.typeCheckingMode": "strict",
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
-        "editor.formatOnSave": true
+        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.formatOnSave": true,
+        "editor.codeActionsOnSave": {
+            "source.fixAll": "explicit",
+            "source.organizeImports": "explicit"
+        },
     },
+    "ruff.path": ["/nix/store/s3q6qc2954x62bkcs9dwaxyiqchl7j01-ruff-0.5.6/bin/ruff"],
     "tailwind-fold.supportedLanguages": [
         "html",
         "typescriptreact",