diff --git a/.devcontainer/.zshrc b/.devcontainer/.zshrc deleted file mode 100644 index f267201..0000000 --- a/.devcontainer/.zshrc +++ /dev/null @@ -1,109 +0,0 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH - -# Path to your Oh My Zsh installation. -export ZSH="$HOME/.oh-my-zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time Oh My Zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="gnzh" - -# Set list of themes to pick from when loading at random -# Setting this variable when ZSH_THEME="devcontainers" -# a theme from this variable instead of looking in $ZSH/themes/ -# If set to an empty array, this variable will have no effect. -# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. -# Case-sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment one of the following lines to change the auto-update behavior -# zstyle ':omz:update' mode disabled # disable automatic updates -# zstyle ':omz:update' mode auto # update automatically without asking -# zstyle ':omz:update' mode reminder # just remind me to update when it's time - -# Uncomment the following line to change how often to auto-update (in days). -# zstyle ':omz:update' frequency 13 - -# Uncomment the following line if pasting URLs and other text is messed up. -# DISABLE_MAGIC_FUNCTIONS="true" - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# You can also set it to another string to have that shown instead of the default red dots. -# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" -# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# You can set one of the optional three formats: -# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# or set a custom format using the strftime function format specifications, -# see 'man strftime' for details. -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? -# Standard plugins can be found in $ZSH/plugins/ -# Custom plugins may be added to $ZSH_CUSTOM/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(git timer web-search ssh kubectl helm colorize zsh-autosuggestions rclone ansible) -ZSH_COLORIZE_TOOL=chroma - -source $ZSH/oh-my-zsh.sh - -# User configuration - -# export MANPATH="/usr/local/man:$MANPATH" - -# You may need to manually set your language environment -# export LANG=en_US.UTF-8 - -# Preferred editor for local and remote sessions -# if [[ -n $SSH_CONNECTION ]]; then -# export EDITOR='vim' -# else -# export EDITOR='nvim' -# fi - -# Compilation flags -# export ARCHFLAGS="-arch $(uname -m)" - -# Set personal aliases, overriding those provided by Oh My Zsh libs, -# plugins, and themes. Aliases can be placed here, though Oh My Zsh -# users are encouraged to define aliases within a top-level file in -# the $ZSH_CUSTOM folder, with .zsh extension. Examples: -# - $ZSH_CUSTOM/aliases.zsh -# - $ZSH_CUSTOM/macos.zsh -# For a full list of active aliases, run `alias`. -# -# Example aliases -# alias zshconfig="mate ~/.zshrc" -# alias ohmyzsh="mate ~/.oh-my-zsh" -DISABLE_AUTO_UPDATE=true -DISABLE_UPDATE_PROMPT=true - -export PATH=$PATH:/home/vscode/lib \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5ec1ce1..0326329 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,19 +3,12 @@ { "name": "casa-dev", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/base:jammy", - "features": { - "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {} - }, - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - // Configure tool-specific properties. - // "customizations": {}, - + "image": "git.limbosolutions.com/mylimbo/devcontainers/devops:latest", + "remoteUser": "vscode", + "runArgs": [ + "--hostname=casa-dev" + ], "mounts": [ - "source=${localWorkspaceFolder}/.devcontainer/.zshrc,target=/home/vscode/.zshrc,type=bind", "source=${localWorkspaceFolder}/../lms,target=/workspaces/lms,type=bind", "source=${localWorkspaceFolder}/../homeAssistant,target=/workspaces/homeAssistant,type=bind", "source=${localWorkspaceFolder}/../mosquitto,target=/workspaces/mosquitto,type=bind", @@ -25,21 +18,22 @@ "source=${localEnv:HOME}/.gitconfig,target=/home/vscode/.gitconfig,type=bind,consistency=cached", "source=${localEnv:HOME}/.ssh,target=/home/vscode/.ssh,type=bind,consistency=cached" ], - "postCreateCommand": "bash .devcontainer/scripts/postCreate.sh", "customizations": { "vscode": { "extensions": [ "ms-kubernetes-tools.vscode-kubernetes-tools", + "redhat.ansible", "mtxr.sqltools-driver-mysql", "stateful.runme", "yzhang.markdown-all-in-one", "davidanson.vscode-markdownlint", "eamodio.gitlens", - "m4ns0ur.base64" - ], - "settings": { - "terminal.integrated.defaultProfile.linux": "zsh" - } + "m4ns0ur.base64", + "rogalmic.bash-debug", + "streetsidesoftware.code-spell-checker", + "ms-azuretools.vscode-containers" + + ] } } } diff --git a/.devcontainer/scripts/postCreate.sh b/.devcontainer/scripts/postCreate.sh deleted file mode 100644 index ac47c63..0000000 --- a/.devcontainer/scripts/postCreate.sh +++ /dev/null @@ -1,5 +0,0 @@ -#setup chroma for zsh colorize -chmod +x /home/vscode/lib/chroma -curl https://rclone.org/install.sh | sudo bash - - diff --git a/casa.full-stack.code-workspace b/casa.full-stack.code-workspace index cb1f1c4..b16cb9a 100644 --- a/casa.full-stack.code-workspace +++ b/casa.full-stack.code-workspace @@ -22,12 +22,6 @@ "name": "pi.bluetooth.speaker", "path": "../pi.bluetooth.speaker" }, - // { - // "name": "kb/kb", - // "path": "../../kb/kb" - // } - - ], "settings": { "files.exclude": { @@ -38,6 +32,8 @@ "**/.DS_Store": true, "**/Thumbs.db": true, "kb": true, + "runme.taskProvider.enabled": false, + "runme.scanMode": "off" }, @@ -49,5 +45,47 @@ "rclone", "reverseproxy" ] -} +}, +"tasks": { + "version": "2.0.0", + "tasks": [ + { + "label": "Run current shell file - relative", + "type": "shell", + "command": "bash", + "args": [ + "${file}" + ], + "options": { + "cwd": "${fileDirname}" + }, + "group": { + }, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + } + }, + { + "label": "Run current shell file", + "type": "shell", + "command": "bash", + "args": [ + "${file}" + ], + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "echo": true, + "reveal": "always", + "focus": false, + "panel": "shared" + } + } + ] +} } \ No newline at end of file