Skip to content

Commit 884c17a

Browse files
committed
chore: sync devcontainer settings
Signed-off-by: ZHANG Yuntian <yt@radxa.com>
1 parent 5b22784 commit 884c17a

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.devcontainer/devcontainer.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22
"customizations": {
33
"vscode": {
44
"settings": {
5-
"terminal.integrated.defaultProfile.linux": "bash"
6-
},
5+
"terminal.integrated.defaultProfile.linux": "bash"
6+
},
77
"extensions": [
88
"mkhl.direnv",
99
"github.vscode-github-actions",
1010
"grafana.vscode-jsonnet",
11+
"ms-vscode.cpptools-extension-pack",
1112
"ms-vscode.makefile-tools",
1213
"vivaxy.vscode-conventional-commits"
1314
]
1415
}
1516
},
16-
"image": "mcr.microsoft.com/devcontainers/base:jammy",
17+
"image": "mcr.microsoft.com/devcontainers/base:bookworm",
1718
"features": {
1819
"ghcr.io/devcontainers/features/nix:1": {
19-
"version": "2.21.0",
20+
"version": "latest",
2021
"packages": [
22+
"cachix",
2123
"direnv",
2224
"devenv"
2325
],

src/share/rsdk/infra-package/.devcontainer/devcontainer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
"features": {
1919
"ghcr.io/devcontainers/features/nix:1": {
2020
"version": "latest",
21-
"packages": "cachix,direnv,devenv",
21+
"packages": [
22+
"cachix",
23+
"direnv",
24+
"devenv"
25+
],
2226
"useAttributePath": true,
2327
"extraNixConfig": [
2428
"experimental-features = nix-command flakes",

0 commit comments

Comments
 (0)