diff options
| author | QMK Bot <hello@qmk.fm> | 2021-08-04 00:23:25 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-08-04 00:23:25 +0000 |
| commit | 600faab707e188bd6dc0c9a202f8308f6c82556e (patch) | |
| tree | 3f3c940a9caa58d240bb16049173ab8bdd76e680 /docs | |
| parent | 4ffc9d8288fcfaec957a8eafc28af7d8d22e7c6c (diff) | |
| parent | a0f2be18a40b157fc22720d127da9b312b1232bf (diff) | |
| download | qmk_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.md | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docs/other_vscode.md b/docs/other_vscode.md index 823f8b498..2de3c8cb4 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 | |||
| 65 | 65 | ||
| 66 | ```json | 66 | ```json |
| 67 | { | 67 | { |
| 68 | "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe", | 68 | "terminal.integrated.profiles.windows": { |
| 69 | "terminal.integrated.env.windows": { | 69 | "QMK_MSYS": { |
| 70 | "MSYSTEM": "MINGW64", | 70 | "path": "C:/QMK_MSYS/usr/bin/bash.exe", |
| 71 | "CHERE_INVOKING": "1" | 71 | "env": { |
| 72 | "MSYSTEM": "MINGW64", | ||
| 73 | "CHERE_INVOKING": "1" | ||
| 74 | }, | ||
| 75 | "args": ["--login"] | ||
| 76 | } | ||
| 72 | }, | 77 | }, |
| 73 | "terminal.integrated.shellArgs.windows": [ | 78 | |
| 74 | "--login" | ||
| 75 | ], | ||
| 76 | "terminal.integrated.cursorStyle": "line" | 79 | "terminal.integrated.cursorStyle": "line" |
| 77 | } | 80 | } |
| 78 | ``` | 81 | ``` |