diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 156d242..866b727 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,38 +1,41 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-docker-compose { - "name": "Existing Docker Compose (Extend)", - - - // Sets the run context to one level up instead of the .devcontainer folder. - "context": "../vscode", - - // Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename. - "dockerFile": "../vscode/Dockerfile", - - // The optional 'workspaceFolder' property is the path VS Code should open by default when - // connected. This is typically a file mount in .devcontainer/docker-compose.yml - "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}" - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Uncomment the next line if you want start specific services in your Docker Compose config. - // "runServices": [], - - // Uncomment the next line if you want to keep your containers running after VS Code shuts down. - // "shutdownAction": "none", - - // Uncomment the next line to run commands after the container is created. - // "postCreateCommand": "cat /etc/os-release", - - // Configure tool-specific properties.root - // "customizations": {}, - - // Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "devcontainer" + "name": "Example devcontainer for add-on repositories", + "image": "ghcr.io/home-assistant/devcontainer:2-addons", + "appPort": [ + "7123:8123", + "7357:4357" + ], + "postStartCommand": "bash devcontainer_bootstrap", + "runArgs": [ + "-e", + "GIT_EDITOR=code --wait", + "--privileged" + ], + "containerEnv": { + "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}" + }, + "customizations": { + "vscode": { + "extensions": [ + "timonwong.shellcheck", + "esbenp.prettier-vscode" + ], + "settings": { + "terminal.integrated.profiles.linux": { + "zsh": { + "path": "/usr/bin/zsh" + } + }, + "terminal.integrated.defaultProfile.linux": "zsh", + "editor.formatOnPaste": false, + "editor.formatOnSave": true, + "editor.formatOnType": true, + "files.trimTrailingWhitespace": true + } + } + }, + "mounts": [ + "type=volume,target=/var/lib/docker", + "type=volume,target=/mnt/supervisor" + ] } - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f18822e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.devcontainer/docker-compose.yml +todo.txt diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..091effa --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,20 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Start Home Assistant", + "type": "shell", + "command": "supervisor_run", + "group": { + "kind": "test", + "isDefault": true + }, + "presentation": { + "reveal": "always", + "panel": "new" + }, + "problemMatcher": [] + } + ] + } + diff --git a/todo.txt b/todo.txt index 4d2ddd8..fdcaeb9 100644 --- a/todo.txt +++ b/todo.txt @@ -21,4 +21,4 @@ map: - type: share read_only: false - type: ssl - read_only: false + read_only: false \ No newline at end of file diff --git a/vscode/.README.j2 b/vscode-plugin/.README.j2 similarity index 100% rename from vscode/.README.j2 rename to vscode-plugin/.README.j2 diff --git a/vscode/DOCS.md b/vscode-plugin/DOCS.md similarity index 100% rename from vscode/DOCS.md rename to vscode-plugin/DOCS.md diff --git a/vscode/Dockerfile b/vscode-plugin/Dockerfile old mode 100755 new mode 100644 similarity index 100% rename from vscode/Dockerfile rename to vscode-plugin/Dockerfile diff --git a/vscode/build.yaml b/vscode-plugin/build.yaml similarity index 100% rename from vscode/build.yaml rename to vscode-plugin/build.yaml diff --git a/vscode/config.yaml b/vscode-plugin/config.yaml similarity index 100% rename from vscode/config.yaml rename to vscode-plugin/config.yaml diff --git a/vscode/icon.png b/vscode-plugin/icon.png similarity index 100% rename from vscode/icon.png rename to vscode-plugin/icon.png diff --git a/vscode/logo.png b/vscode-plugin/logo.png similarity index 100% rename from vscode/logo.png rename to vscode-plugin/logo.png diff --git a/vscode/rootfs/etc/motd b/vscode-plugin/rootfs/etc/motd old mode 100755 new mode 100644 similarity index 100% rename from vscode/rootfs/etc/motd rename to vscode-plugin/rootfs/etc/motd diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-code-server diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mosquitto b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mosquitto similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mosquitto rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mosquitto diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mysql b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mysql similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mysql rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-mysql diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/dependencies.d/init-user diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/finish diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/run similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/run rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/type b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/type similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/code-server/type rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/code-server/type diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/dependencies.d/base diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/type diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-code-server/up diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/dependencies.d/base diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/type diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mosquitto/up diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/dependencies.d/base diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/type diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-mysql/up diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/dependencies.d/base diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/run similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/run rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/run diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/type b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/type similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/type rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/type diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/up b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/up similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/init-user/up rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/init-user/up diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/code-server diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-code-server diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mosquitto diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-mysql diff --git a/vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user b/vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user similarity index 100% rename from vscode/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user rename to vscode-plugin/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-user diff --git a/vscode/rootfs/root/.zshrc b/vscode-plugin/rootfs/root/.zshrc old mode 100755 new mode 100644 similarity index 100% rename from vscode/rootfs/root/.zshrc rename to vscode-plugin/rootfs/root/.zshrc diff --git a/vscode/rootfs/usr/bin/code b/vscode-plugin/rootfs/usr/bin/code similarity index 100% rename from vscode/rootfs/usr/bin/code rename to vscode-plugin/rootfs/usr/bin/code diff --git a/vscode/rootfs/var/lib/code-server/defaults/config.yaml b/vscode-plugin/rootfs/var/lib/code-server/defaults/config.yaml similarity index 100% rename from vscode/rootfs/var/lib/code-server/defaults/config.yaml rename to vscode-plugin/rootfs/var/lib/code-server/defaults/config.yaml diff --git a/vscode/rootfs/var/lib/code-server/defaults/requirements.txt b/vscode-plugin/rootfs/var/lib/code-server/defaults/requirements.txt similarity index 100% rename from vscode/rootfs/var/lib/code-server/defaults/requirements.txt rename to vscode-plugin/rootfs/var/lib/code-server/defaults/requirements.txt diff --git a/vscode/rootfs/var/lib/code-server/defaults/settings.json b/vscode-plugin/rootfs/var/lib/code-server/defaults/settings.json similarity index 100% rename from vscode/rootfs/var/lib/code-server/defaults/settings.json rename to vscode-plugin/rootfs/var/lib/code-server/defaults/settings.json diff --git a/vscode/rootfs/var/lib/code-server/defaults/vscode.extensions b/vscode-plugin/rootfs/var/lib/code-server/defaults/vscode.extensions similarity index 100% rename from vscode/rootfs/var/lib/code-server/defaults/vscode.extensions rename to vscode-plugin/rootfs/var/lib/code-server/defaults/vscode.extensions diff --git a/vscode/rootfs/var/lib/code-server/defaults/workspaces.json b/vscode-plugin/rootfs/var/lib/code-server/defaults/workspaces.json similarity index 100% rename from vscode/rootfs/var/lib/code-server/defaults/workspaces.json rename to vscode-plugin/rootfs/var/lib/code-server/defaults/workspaces.json