updated to match PR xtruder#18

djsnipa1 · Dec 9, 2023 · 1c40f2e · 1c40f2e
1 parent ab1900a
commit 1c40f2e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 26 deletions.
diff --git a/.devcontainer/codespaces/devcontainer.json b/.devcontainer/codespaces/devcontainer.json
@@ -4,31 +4,28 @@
   "name": "devcontainer-codespaces",
   "dockerFile": "${localWorkspaceFolder}/src/Dockerfile",
   "context": "${localWorkspaceFolder}/src",
-
   // run arguments passed to docker
   "runArgs": [
-    "--security-opt", "label=disable"
+    "--security-opt",
+    "label=disable"
   ],
-
   "containerEnv": {
-     // extensions to preload before other extensions
+    // extensions to preload before other extensions
     "PRELOAD_EXTENSIONS": "arrterian.nix-env-selector"
   },
-
-   // disable command overriding and updating remote user ID
+  // disable command overriding and updating remote user ID
   "overrideCommand": false,
   "userEnvProbe": "loginShell",
   "updateRemoteUserUID": false,
-
   // build development environment on creation, make sure you already have shell.nix
   "onCreateCommand": "nix-shell --command 'echo done building nix dev environment'",
-
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    // select nix environment
-    "arrterian.nix-env-selector"
-  ],
-
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "arrterian.nix-env-selector",
+      ]
+    }
+  },
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   "forwardPorts": []
-}
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,17 +5,18 @@
   "dockerComposeFile": "docker-compose.yml",
   "service": "dev",
   "workspaceFolder": "/workspace",
-
   "userEnvProbe": "loginShell",
   "updateRemoteUserUID": false,
-
   "onCreateCommand": "nix-shell --command 'echo done building nix dev environment'",
-
-  "extensions": [
-    "arrterian.nix-env-selector",
-    "jnoortheen.nix-ide",
-    "fsevenm.run-it-on",
-    "ms-azuretools.vscode-docker",
-    "yzhang.markdown-all-in-one"
-  ]
-}
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "arrterian.nix-env-selector",
+        "jnoortheen.nix-ide",
+        "fsevenm.run-it-on",
+        "ms-azuretools.vscode-docker",
+        "yzhang.markdown-all-in-one"
+      ]
+    }
+  }
+}