From bb895b2bec4c99d90c8a27b1e2b4cae0e75c0b69 Mon Sep 17 00:00:00 2001
From: Richard Sperry <Richard@SperryFamily.net>
Date: Wed, 16 Apr 2025 12:20:48 -0700
Subject: [PATCH] devenv

---
 addon-vscode.code-workspace                     |  7 +++++--
 vscode/config.yaml                              |  1 +
 .../etc/s6-overlay/s6-rc.d/init-code-server/run | 17 ++++++++++++-----
 .../var/lib/code-server/config/extensions.json  |  0
 .../var/lib/code-server/defaults/config.yaml    |  2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 vscode/rootfs/var/lib/code-server/config/extensions.json

diff --git a/addon-vscode.code-workspace b/addon-vscode.code-workspace
index c30bff4..9ef6296 100644
--- a/addon-vscode.code-workspace
+++ b/addon-vscode.code-workspace
@@ -6,7 +6,10 @@
 	],
 	"settings": {
 		"yaml.schemas": {
-			"https://json.schemastore.org/yamllint.json": "file:///f%3A/repos/addon-vscode/vscode/rootfs/usr/lib/code-server/defaults/config.yaml"
+			"https://json.schemastore.org/yamllint.json": [
+				"file:///f%3A/repos/addon-vscode/vscode/rootfs/usr/lib/code-server/defaults/config.yaml",
+				"file:///f%3A/repos/addon-vscode/vscode/rootfs/var/lib/code-server/defaults/config.yaml"
+			]
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/vscode/config.yaml b/vscode/config.yaml
index feac357..468f48d 100644
--- a/vscode/config.yaml
+++ b/vscode/config.yaml
@@ -28,6 +28,7 @@ map:
     read_only: false
   - type: homeassistant_config
     read_only: false
+    path: /config
   - type: media
     read_only: false
   - type: share
diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
index 8451905..d917fd1 100644
--- a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
+++ b/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run
@@ -22,13 +22,20 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     dbe905f0935b2fea8bb5ba379bff78db9d056ea6d0965c68aa9b07938a52cbbf117186452b2b6c766aa4cf93cc3494ad91b763e8500e515e41d8cde31a3821ae
     2212babaa9dc46d38ba239052c9c05151abe517cc8b493d0d351a96bf70c1efa4f7479f6ed0b75811429ba649906eb5657d73b0732b460e718a5c66603dcdbda
 )
-
+readonly -a DIRECTORIES=(addon_configs addons backup config media share ssl)
 readonly DEFAULT_FILES_PATH="/var/lib/code-server/defaults"
-readonly DEFAULT_CONFIG_PATH="$addon_configs/vscode"
+readonly DEFAULT_CONFIG_PATH="/SERVER/config/vscode"
 readonly CODE_SERVER_CONFIG_DIR="/root/.config/code-server/"
- CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
- CODE_SERVER_EXTENSIONS_INSTALL_PATH="$DEFAULT_CONFIG_PATH/extentions"
- CODE_SERVER_EXTENSIONS_LIST="$DEFAULT_CONFIG_PATH/vscode.extensions"
+
+CODE_SERVER_CONFIG="$DEFAULT_CONFIG_PATH/config.yaml"
+readonly CODE_SERVER_EXTENSIONS_INSTALL_PATH="$DEFAULT_CONFIG_PATH/extentions"
+readonly CODE_SERVER_EXTENSIONS_LIST="$DEFAULT_CONFIG_PATH/vscode.extensions"
+
+# Links some common directories to the user's home folder for convenience
+for dir in "${DIRECTORIES[@]}"; do
+    ln -sn "/${dir}" "/SERVER/${dir}" ||
+        bashio::log.warning "Failed linking common directory: ${dir}"
+done
 
 # Ensure config path exists
 if bashio::config.has_value "vscode_config_path"; then
diff --git a/vscode/rootfs/var/lib/code-server/config/extensions.json b/vscode/rootfs/var/lib/code-server/config/extensions.json
new file mode 100644
index 0000000..e69de29
diff --git a/vscode/rootfs/var/lib/code-server/defaults/config.yaml b/vscode/rootfs/var/lib/code-server/defaults/config.yaml
index 7f4ab4a..2215d2b 100644
--- a/vscode/rootfs/var/lib/code-server/defaults/config.yaml
+++ b/vscode/rootfs/var/lib/code-server/defaults/config.yaml
@@ -7,5 +7,5 @@ disable-getting-started-override: true
 disable-update-check: true
 disable-telemetry: true
 user-data-dir: "/config/addon_configs/vscode"
-# extensions-dir: "/data/vscode/extentions"
+extensions-dir: "/var/lib/code-server/config/"
 log: warn