diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index bd01b9f..0000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "name": "Development environments on your infrastructure", - "image": "mcr.microsoft.com/devcontainers/rust:2-1-trixie", - "features": { - "ghcr.io/devcontainers/features/node:1": { - "version": "latest" - }, - "ghcr.io/devcontainers/features/python:1": { - "version": "latest" - }, - "ghcr.io/coder/devcontainer-features/code-server:1": { - "auth": "none", - "port": 13337 - }, - "ghcr.io/devcontainers/features/docker-in-docker:2": { - "moby": "false" - } - }, - // SYS_PTRACE to enable go debugging - "runArgs": ["--cap-add=SYS_PTRACE"], - "customizations": { - "vscode": { - "extensions": [ - "dustypomerleau.rust-syntax", - "rust-lang.rust-analyzer", - "tamasfe.even-better-toml", - "fill-labs.dependi" - ] - }, - "coder": { - "apps": [ - { - "slug": "cursor", - "displayName": "Cursor Desktop", - "url": "cursor://coder.coder-remote/openDevContainer?owner=${localEnv:CODER_WORKSPACE_OWNER_NAME}&workspace=${localEnv:CODER_WORKSPACE_NAME}&agent=${localEnv:CODER_WORKSPACE_PARENT_AGENT_NAME}&url=${localEnv:CODER_URL}&token=$SESSION_TOKEN&devContainerName=${localEnv:CONTAINER_ID}&devContainerFolder=${containerWorkspaceFolder}&localWorkspaceFolder=${localWorkspaceFolder}", - "external": true, - "icon": "/icon/cursor.svg", - "order": 5 - }, - { - "slug": "zed", - "displayName": "Zed Editor", - "url": "zed://ssh/${localEnv:CODER_WORKSPACE_AGENT_NAME}.${localEnv:CODER_WORKSPACE_NAME}.${localEnv:CODER_WORKSPACE_OWNER_NAME}.coder${containerWorkspaceFolder}", - "external": true, - "icon": "/icon/zed.svg", - "order": 3 - }, - // Reproduce `code-server` app here from the code-server - // feature so that we can set the correct folder and order. - // Currently, the order cannot be specified via option because - // we parse it as a number whereas variable interpolation - // results in a string. Additionally we set health check which - // is not yet set in the feature. - { - "slug": "code-server", - "displayName": "VS Code Web", - "url": "http://${localEnv:FEATURE_CODE_SERVER_OPTION_HOST:127.0.0.1}:${localEnv:FEATURE_CODE_SERVER_OPTION_PORT:8080}/?folder=${containerWorkspaceFolder}", - "openIn": "${localEnv:FEATURE_CODE_SERVER_OPTION_APPOPENIN:slim-window}", - "share": "${localEnv:FEATURE_CODE_SERVER_OPTION_APPSHARE:owner}", - "icon": "/icon/code.svg", - "order": 2, - "healthCheck": { - "url": "http://${localEnv:FEATURE_CODE_SERVER_OPTION_HOST:127.0.0.1}:${localEnv:FEATURE_CODE_SERVER_OPTION_PORT:8080}/healthz", - "interval": 5, - "threshold": 2 - } - } - ] - } - }, - "mounts": [ - // Add a volume for the Coder home directory to persist shell history, - // and speed up dotfiles init and/or personalization. - "source=coder-coder-devcontainer-home,target=/home/coder,type=volume", - // Mount the entire home because conditional mounts are not supported. - // See: https://github.com/devcontainers/spec/issues/132 - "source=${localEnv:HOME},target=/mnt/home/coder,type=bind,readonly" - ], - "postCreateCommand": ["./.devcontainer/scripts/post_create.sh"], - "postStartCommand": ["./.devcontainer/scripts/post_start.sh"] -} diff --git a/.devcontainer/scripts/post_create.sh b/.devcontainer/scripts/post_create.sh deleted file mode 100755 index ab5be4b..0000000 --- a/.devcontainer/scripts/post_create.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -install_devcontainer_cli() { - set -e - echo "🔧 Installing DevContainer CLI..." - cd "$(dirname "$0")/../tools/devcontainer-cli" - npm ci --omit=dev - ln -sf "$(pwd)/node_modules/.bin/devcontainer" "$(npm config get prefix)/bin/devcontainer" -} - -install_ssh_config() { - echo "🔑 Installing SSH configuration..." - if [ -d /mnt/home/coder/.ssh ]; then - rsync -a /mnt/home/coder/.ssh/ ~/.ssh/ - chmod 0700 ~/.ssh - else - echo "⚠️ SSH directory not found." - fi -} - -install_git_config() { - echo "📂 Installing Git configuration..." - if [ -f /mnt/home/coder/git/config ]; then - rsync -a /mnt/home/coder/git/ ~/.config/git/ - elif [ -d /mnt/home/coder/.gitconfig ]; then - rsync -a /mnt/home/coder/.gitconfig ~/.gitconfig - else - echo "⚠️ Git configuration directory not found." - fi -} - -install_dotfiles() { - if [ ! -d /mnt/home/coder/.config/coderv2/dotfiles ]; then - echo "⚠️ Dotfiles directory not found." - return - fi - - cd /mnt/home/coder/.config/coderv2/dotfiles || return - for script in install.sh install bootstrap.sh bootstrap script/bootstrap setup.sh setup script/setup; do - if [ -x $script ]; then - echo "📦 Installing dotfiles..." - ./$script || { - echo "❌ Error running $script. Please check the script for issues." - return - } - echo "✅ Dotfiles installed successfully." - return - fi - done - echo "⚠️ No install script found in dotfiles directory." -} - -personalize() { - # Allow script to continue as Coder dogfood utilizes a hack to - # synchronize startup script execution. - touch /tmp/.coder-startup-script.done - - if [ -x /mnt/home/coder/personalize ]; then - echo "🎨 Personalizing environment..." - /mnt/home/coder/personalize - fi -} - -install_devcontainer_cli -install_ssh_config -install_dotfiles -personalize diff --git a/.devcontainer/scripts/post_start.sh b/.devcontainer/scripts/post_start.sh deleted file mode 100755 index c986740..0000000 --- a/.devcontainer/scripts/post_start.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Start Docker service if not already running. -sudo service docker start diff --git a/.devcontainer/tools/devcontainer-cli/package-lock.json b/.devcontainer/tools/devcontainer-cli/package-lock.json deleted file mode 100644 index 2fee536..0000000 --- a/.devcontainer/tools/devcontainer-cli/package-lock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "devcontainer-cli", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "devcontainer-cli", - "version": "1.0.0", - "dependencies": { - "@devcontainers/cli": "^0.80.0" - } - }, - "node_modules/@devcontainers/cli": { - "version": "0.80.0", - "resolved": "https://registry.npmjs.org/@devcontainers/cli/-/cli-0.80.0.tgz", - "integrity": "sha512-w2EaxgjyeVGyzfA/KUEZBhyXqu/5PyWNXcnrXsZOBrt3aN2zyGiHrXoG54TF6K0b5DSCF01Rt5fnIyrCeFzFKw==", - "bin": { - "devcontainer": "devcontainer.js" - }, - "engines": { - "node": "^16.13.0 || >=18.0.0" - } - } - } -} diff --git a/.devcontainer/tools/devcontainer-cli/package.json b/.devcontainer/tools/devcontainer-cli/package.json deleted file mode 100644 index b474c86..0000000 --- a/.devcontainer/tools/devcontainer-cli/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "devcontainer-cli", - "private": true, - "version": "1.0.0", - "dependencies": { - "@devcontainers/cli": "^0.80.0" - } -} diff --git a/.gitignore b/.gitignore index 7031d8e..d5235d8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,9 +24,10 @@ target # Added by cargo /target +/__pycache__ .env -node_modules/ +/node_modules bracket_pairings.txt \ No newline at end of file