From 01adb2537aadc135f257301f2928e725e5c617c5 Mon Sep 17 00:00:00 2001
From: Kat Morgan <kat@braincraft.io>
Date: Wed, 10 Jan 2024 12:03:51 -0800
Subject: [PATCH] add vim plugin and set to disabled by default (#30)

* flip vim plugin to disabled by default

* flip vim plugin to disabled by default
---
 containers/kind/devcontainer.json | 13 ++++++-----
 devcontainer.json                 | 39 ++++++++++++++++---------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/containers/kind/devcontainer.json b/containers/kind/devcontainer.json
index 088b0b2..d148bbb 100644
--- a/containers/kind/devcontainer.json
+++ b/containers/kind/devcontainer.json
@@ -3,12 +3,13 @@
 // - https://containers.dev/implementors/features
 // - https://code.visualstudio.com/docs/getstarted/settings
 {
-  "name": "pulumi-devcontainer-kind",
+  "name": "pulumi-devcontainer",
   "image": "ghcr.io/pulumi/devcontainer:latest",
   "customizations": {
     "vscode": {
       "settings": {
         // https://github.com/VSCodeVim/Vim
+        "vim.disableExtension": true,
         "vim.easymotion": true,
         "vim.incsearch": true,
         "vim.useSystemClipboard": true,
@@ -48,8 +49,8 @@
       },
       "extensions": [
         "golang.go",
-        "vscodevim.vim",
         "github.copilot",
+        "vscodevim.vim",
         "ms-python.python",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",
@@ -67,18 +68,18 @@
         "username": "vscode",
         "userGid": "automatic",
         "userUid": "automatic",
-        "upgradePackages": true,
+        "upgradePackages": false,
         "nonFreePackages": true
     },
     "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
-        "moby": false,
         "installDockerBuildx": true,
+        "dockerDashComposeVersion": "v2",
         "version": "latest",
-        "dockerDashComposeVersion": "v2"
+        "moby": false
     },
     "ghcr.io/devcontainers-contrib/features/kind:1": {}
   },
-  "postCreateCommand": "git submodule update --init --recursive",
+  "postCreateCommand": "git submodule update --init --recursive; direnv allow",
   "remoteUser": "vscode",
   "forwardPorts": [1313, 2222, 6000, 7681, 8080],
   "runArgs": ["--network=host"]
diff --git a/devcontainer.json b/devcontainer.json
index 59e1d9b..7b0f30d 100644
--- a/devcontainer.json
+++ b/devcontainer.json
@@ -9,24 +9,25 @@
     "vscode": {
       "settings": {
         // https://github.com/VSCodeVim/Vim
-        //"vim.easymotion": true,
-        //"vim.incsearch": true,
-        //"vim.useSystemClipboard": true,
-        //"vim.useCtrlKeys": true,
-        //"vim.hlsearch": true,
-        //"vim.insertModeKeyBindings": [
-        //  {
-        //    "before": ["j", "j"],
-        //    "after": ["<Esc>"]
-        //  }
-        //],
-        //"vim.handleKeys": {
-        //  "<C-a>": false,
-        //  "<C-f>": false
-        //},
-        //"extensions.experimental.affinity": {
-        //  "vscodevim.vim": 1
-        //},
+        "vim.disableExtension": true,
+        "vim.easymotion": true,
+        "vim.incsearch": true,
+        "vim.useSystemClipboard": true,
+        "vim.useCtrlKeys": true,
+        "vim.hlsearch": true,
+        "vim.insertModeKeyBindings": [
+          {
+            "before": ["j", "j"],
+            "after": ["<Esc>"]
+          }
+        ],
+        "vim.handleKeys": {
+          "<C-a>": false,
+          "<C-f>": false
+        },
+        "extensions.experimental.affinity": {
+          "vscodevim.vim": 1
+        },
         "go.testTags": "all",
         "go.buildTags": "all",
         "editor.minimap.enabled": false,
@@ -49,7 +50,7 @@
       "extensions": [
         "golang.go",
         "github.copilot",
-        //"vscodevim.vim",
+        "vscodevim.vim",
         "ms-python.python",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",