Skip to content

Commit

Permalink
Remove auto-generated workspace file, sync suggested extensions with …
Browse files Browse the repository at this point in the history
…qmk/qmk_firmware.
  • Loading branch information
tzarc committed Feb 22, 2024
1 parent 5bb2088 commit 6da981f
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 34 deletions.
43 changes: 24 additions & 19 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/debian
{
"name": "QMK CLI",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "ghcr.io/qmk/qmk_cli",
"customizations": {
"vscode": {
"extensions": [
"amodio.toggle-excluded-files"
]
}
},
"postCreateCommand": "/workspaces/qmk_userspace/.devcontainer/setup.sh"
"name": "QMK CLI",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "ghcr.io/qmk/qmk_cli",
"customizations": {
"vscode": {
"extensions": [
"amodio.toggle-excluded-files",
"EditorConfig.EditorConfig",
"xaver.clang-format",
"llvm-vs-code-extensions.vscode-clangd",
"bierner.github-markdown-preview",
"donjayamanne.git-extension-pack"
]
}
},
"postCreateCommand": "/workspaces/qmk_userspace/.devcontainer/setup.sh"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],
// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Configure tool-specific properties.
// "customizations": {},
// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
15 changes: 0 additions & 15 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,3 @@ qmk config user.qmk_home=/workspaces/qmk_firmware
qmk config user.overlay_dir=/workspaces/qmk_userspace

qmk git-submodule

cat << __EOF__ > /workspaces/qmk_userspace/devcontainer.code-workspace
{
"folders": [
{
"name": "qmk_userspace",
"path": "/workspaces/qmk_userspace"
},
{
"name": "qmk_firmware",
"path": "/workspaces/qmk_firmware"
},
],
}
__EOF__
11 changes: 11 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Suggested extensions
{
"recommendations": [
"amodio.toggle-excluded-files",
"EditorConfig.EditorConfig",
"xaver.clang-format",
"llvm-vs-code-extensions.vscode-clangd",
"bierner.github-markdown-preview",
"donjayamanne.git-extension-pack"
]
}

0 comments on commit 6da981f

Please sign in to comment.