From 76d8a32a531f1fbeb8197dd9fb7d6a0e8ef50a33 Mon Sep 17 00:00:00 2001
From: Remco de Boer <29308176+redeboer@users.noreply.github.com>
Date: Wed, 10 Jan 2024 21:14:05 +0100
Subject: [PATCH] DX: update developer environment

---
 .pre-commit-config.yaml | 1 +
 .vscode/extensions.json | 3 ++-
 .vscode/settings.json   | 2 ++
 environment.yml         | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 77e8c4a..119dd29 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,6 +2,7 @@ ci:
   autoupdate_commit_msg: "MAINT: autoupdate pre-commit hooks"
   autoupdate_schedule: quarterly
   skip:
+    - prettier
     - taplo
 
 repos:
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 1e6d142..d7908d1 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,15 +1,16 @@
 {
   "recommendations": [
     "esbenp.prettier-vscode",
-    "garaioag.garaio-vscode-unwanted-recommendations",
     "github.vscode-github-actions",
     "ms-azuretools.vscode-docker",
     "ms-python.python",
     "redhat.vscode-yaml",
+    "Soulcode.vscode-unwanted-extensions",
     "stkb.rewrap"
   ],
   "unwantedRecommendations": [
     "davidanson.vscode-markdownlint",
+    "garaioag.garaio-vscode-unwanted-recommendations",
     "travisillig.vscode-json-stable-stringify"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e34a16f..74d4a5a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -3,7 +3,9 @@
     "editor.rulers": [72],
     "rewrap.wrappingColumn": 72
   },
+  "diffEditor.experimental.showMoves": true,
   "editor.formatOnSave": true,
   "github-actions.workflows.pinned.workflows": [".github/workflows/ci.yml"],
+  "multiDiffEditor.experimental.enabled": true,
   "rewrap.wrappingColumn": 88
 }
diff --git a/environment.yml b/environment.yml
index 9254eaa..51fe7d8 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,3 +4,5 @@ dependencies:
   - pip
   - pip:
       - -r requirements.txt
+variables:
+  PRETTIER_LEGACY_CLI: "1"