From 83ed02f4c2a4e5a8f29cd4863d3b3dfc6d5f4d48 Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Thu, 22 Jun 2023 05:50:00 +0000
Subject: [PATCH 1/2] Command Line Changes

---
 container-scripts/{base.sh => default.sh} | 0
 default/main.tf                           | 6 ++----
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename container-scripts/{base.sh => default.sh} (100%)

diff --git a/container-scripts/base.sh b/container-scripts/default.sh
similarity index 100%
rename from container-scripts/base.sh
rename to container-scripts/default.sh
diff --git a/default/main.tf b/default/main.tf
index 84836fd..64894b9 100644
--- a/default/main.tf
+++ b/default/main.tf
@@ -93,8 +93,6 @@ resource "coder_agent" "main" {
     echo "[settings]" >> ~/.wakatime.cfg && echo "api_url = ${var.waka_api_url}" >> ~/.wakatime.cfg && echo "api_key = ${var.waka_api_key}" >> ~/.wakatime.cfg
     # Clone Git Repo
     cd ~/
-    # Specific Extensions
-    code-server --install-extension ms-vscode.cpptools-extension-pack
 
     if [ "${data.coder_parameter.git_repo.value}" != " " ] && [ ! -d "${data.coder_workspace.me.name}" ]
     then
@@ -145,13 +143,13 @@ resource "docker_volume" "home_volume" {
 resource "docker_image" "main" {
   name = "coder-${data.coder_workspace.me.id}"
   build {
-    context = "./${data.coder_parameter.language.value}/build"
+    context = "./dockerfiles/${data.coder_parameter.language.value}"
     build_args = {
       USER = local.username
     }
   }
   triggers = {
-    dir_sha1 = sha1(join("", [for f in fileset(path.module, "build/${data.coder_parameter.language.value}/*") : filesha1(f)]))
+    dir_sha1 = sha1(join("", [for f in fileset(path.module, "dockerfiles/${data.coder_parameter.language.value}/*") : filesha1(f)]))
   }
 }
 

From 9fec8e223e04ee28e2f27117401e356076055520 Mon Sep 17 00:00:00 2001
From: Nicholas Pease <me@nicholaspease.com>
Date: Thu, 22 Jun 2023 05:58:59 +0000
Subject: [PATCH 2/2] Change breaking change

---
 container-scripts/base.sh    | 7 +++++++
 container-scripts/default.sh | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 container-scripts/base.sh

diff --git a/container-scripts/base.sh b/container-scripts/base.sh
new file mode 100644
index 0000000..2d531c0
--- /dev/null
+++ b/container-scripts/base.sh
@@ -0,0 +1,7 @@
+# setup vscode remote server && extensions
+curl -fsSL https://gitea.nicholaspease.com/npease/CoderTemplatesV2/raw/branch/main/container-scripts/vscode_server.sh | sh
+code-server --install-extension WakaTime.vscode-wakatime --install-extension fabiospampinato.vscode-diff --install-extension eamodio.gitlens
+# FancyGit terminal setup
+wget https://raw.githubusercontent.com/diogocavilha/fancy-git/master/install.sh && sh ./install.sh --nofontconfig && rm ./install.sh
+# Misc
+echo export GIT_ASKPASS= >> ~/.bashrc
diff --git a/container-scripts/default.sh b/container-scripts/default.sh
index 2d531c0..e69de29 100644
--- a/container-scripts/default.sh
+++ b/container-scripts/default.sh
@@ -1,7 +0,0 @@
-# setup vscode remote server && extensions
-curl -fsSL https://gitea.nicholaspease.com/npease/CoderTemplatesV2/raw/branch/main/container-scripts/vscode_server.sh | sh
-code-server --install-extension WakaTime.vscode-wakatime --install-extension fabiospampinato.vscode-diff --install-extension eamodio.gitlens
-# FancyGit terminal setup
-wget https://raw.githubusercontent.com/diogocavilha/fancy-git/master/install.sh && sh ./install.sh --nofontconfig && rm ./install.sh
-# Misc
-echo export GIT_ASKPASS= >> ~/.bashrc