diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2dff7dc445ee3b176280e0cff8f4ce396e73a3bc..64d7df2de66b81f63d253b95e37fccf2a13e842e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,6 +35,7 @@ repos:
     hooks:
       - id: ruff
         args: ["--fix", "--exit-non-zero-on-fix", "--show-fixes"]
+      - id: ruff-format
 
   - repo: https://github.com/cheshirekow/cmake-format-precommit
     rev: v0.6.13
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7a2190da61fb9cdb0b3ea9744ead507c03b5ab29..25860b5e51f60ecfef6527c1530ab3ce02c49de2 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,19 +1,22 @@
 {
+  "editor.rulers": [88],
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true,
   "[python]": {
     "editor.codeActionsOnSave": {
-      "source.organizeImports": "always"
+      "source.fixAll": "explicit"
     },
-    "editor.defaultFormatter": "ms-python.black-formatter"
-  },
-  "notebook.defaultFormatter": "ms-python.black-formatter",
-  "notebook.codeActionsOnSave": {
-    "source.organizeImports": "explicit"
+    "editor.defaultFormatter": "charliermarsh.ruff"
   },
+  // "notebook.codeActionsOnSave": {
+  //   "source.fixAll": "explicit"
+  // },
+  "notebook.defaultFormatter": "charliermarsh.ruff",
+  // "ruff.lint.args": ["--config=pyproject.toml"],
+  "ruff.fixAll": true,
   "[cpp]": {
     "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
   },
-  "editor.formatOnSave": true,
-  "isort.args": ["--profile", "black"],
   "notebook.lineNumbers": "on",
   "clangd.arguments": [
     "--log=info",