summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-04 00:23:25 +0000
committerQMK Bot <hello@qmk.fm>2021-08-04 00:23:25 +0000
commit600faab707e188bd6dc0c9a202f8308f6c82556e (patch)
tree3f3c940a9caa58d240bb16049173ab8bdd76e680 /docs
parent4ffc9d8288fcfaec957a8eafc28af7d8d22e7c6c (diff)
parenta0f2be18a40b157fc22720d127da9b312b1232bf (diff)
downloadqmk_firmware-600faab707e188bd6dc0c9a202f8308f6c82556e.tar.gz
qmk_firmware-600faab707e188bd6dc0c9a202f8308f6c82556e.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs')
-rw-r--r--docs/other_vscode.md17
1 files changed, 10 insertions, 7 deletions
diff --git a/docs/other_vscode.md b/docs/other_vscode.md
index 823f8b4982..2de3c8cb45 100644
--- a/docs/other_vscode.md
+++ b/docs/other_vscode.md
@@ -65,14 +65,17 @@ Now, we will set up the MSYS2 window to show up in VSCode as the integrated term
```json
{
- "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
- "terminal.integrated.env.windows": {
- "MSYSTEM": "MINGW64",
- "CHERE_INVOKING": "1"
+ "terminal.integrated.profiles.windows": {
+ "QMK_MSYS": {
+ "path": "C:/QMK_MSYS/usr/bin/bash.exe",
+ "env": {
+ "MSYSTEM": "MINGW64",
+ "CHERE_INVOKING": "1"
+ },
+ "args": ["--login"]
+ }
},
- "terminal.integrated.shellArgs.windows": [
- "--login"
- ],
+
"terminal.integrated.cursorStyle": "line"
}
```