diff --git a/4-aliases.rc b/4-aliases.rc
index dc81e9a..03cb282 100644
--- a/4-aliases.rc
+++ b/4-aliases.rc
@@ -22,9 +22,6 @@ alias pa="pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 pip i
 # Second homebrew install with x86 arch
 alias brew86="arch -x86_64 /usr/local/homebrew/bin/brew"
 
-#shellcheck disable=SC2139
-alias brewbackup="brew bundle dump --force --file=""${THIS_DIRECTORY}""/Brewfile-""${HOST}"""
-
 # Git
 # alias gbd="git branch -d" Moved to functions
 #alias gitrb='for branch in $(git branch -r --merged | grep -v HEAD); do echo -e $(git show --format="%ci %cr %an" "$branch" | head -n 1) \\t$branch; done | sort -r'
@@ -97,7 +94,6 @@ alias dmesg="dmesg -LT"
 alias cpuinfo="sysctl -n machdep.cpu.brand_string"
 alias psql="/Applications/Postgres.app/Contents/Versions/latest/bin/psql"
 alias fastmail_you_there_bro="openssl s_client -connect imap.fastmail.com:993 -crlf"
-
 alias zmv='noglob zmv -W'
 
 # MacOS shortcuts
diff --git a/5-exports.rc b/5-exports.rc
index 0f2fb8d..06f0a50 100644
--- a/5-exports.rc
+++ b/5-exports.rc
@@ -1,8 +1,7 @@
 # shellcheck disable=SC2148 disable=SC1090 shell=bash
 
 ### Exports ###
-export SAM_CLI_TELEMETRY=0                                                                                           # AWS SAM
-export TELEMETRY=0 ENABLE_TELEMETRY=0 SEND_TELEMETRY=0 DO_NOT_TRACK=1 ANALYTICS=0 DISABLE_ANALYTICS=1 NO_ANALYTICS=1 # General catch-all
+export SAM_CLI_TELEMETRY=0 TELEMETRY=0 ENABLE_TELEMETRY=0 SEND_TELEMETRY=0 DO_NOT_TRACK=1 ANALYTICS=0 DISABLE_ANALYTICS=1 NO_ANALYTICS=1 # General catch-all
 export GREP_OPTIONS="--color"
 # export LSCOLORS="ExFxCxDxBxegedabagacad"
 export LS_COLORS="$(vivid generate dracula)"
diff --git a/9-functions.rc b/9-functions.rc
index 465a6ef..9512424 100644
--- a/9-functions.rc
+++ b/9-functions.rc
@@ -151,6 +151,7 @@ commit-hotfix() {
   fi
 
   command git commit $GIT_ARGS -m "Hotfix-${DATESTAMP} -- ${MESSAGE}"
+  command git push
 }
 
 function checkout-jira() {
@@ -166,7 +167,8 @@ function commit-jira() {
   local GIT_ARGS=""
   local MESSAGE="$*" # Set the commit message to the arguments passed to the function
   if [[ -n $* ]]; then
-    GIT_ARGS="-n" # Add -n as a parameter to git if it's passed as an argument to the function
+    GIT_ARGS="-n"    # Add -n as a parameter to git if it's passed as an argument to the function
+    MESSAGE="${*:2}" # Remove the first argument from the list of arguments
     shift 1
   fi
 
@@ -179,12 +181,12 @@ function commit-jira() {
     echo "Would you like to add them? (y/n)"
     read -r ADD_FILES
     if [[ $ADD_FILES == "y" ]]; then
-      git add "$untracked_files"
+      command git add "$untracked_files"
     fi
   fi
 
-  command git add .
   command git commit $GIT_ARGS -m "$(git rev-parse --abbrev-ref HEAD | cut -d'-' -f1 -f2) -- ${MESSAGE}"
+  command git push
 }
 
 # Outputs the name of the current branch
@@ -634,7 +636,7 @@ function s2a-keychain() {
     --skip-prompt \
     --password="$IDPPW" \
     --profile="$INPUT_PROFILE"
-
+  # --skip-verify
   export AWS_PROFILE="$INPUT_PROFILE"
   export AWSCLIPARAMS="--profile=${INPUT_PROFILE}"
   export AWS_DEFAULT_REGION=ap-southeast-2
@@ -1238,3 +1240,71 @@ npm_replace_registry() {
     echo "Replaced $search_string with $replace_string in $file"
   done
 }
+
+### Docker Compose ###
+# Functions to help when working with docker-compose especially with multiple docker-compose files and profiles
+
+# ddc() {
+#   local command="$1"
+#   shift
+#   local service_name="$1"
+#   shift
+#   local profile=""
+
+#   # Iterate through all docker-compose*.yaml files to find the profile
+#   for file in docker-compose*.yaml; do
+#     # Check if the specified service exists in the file
+#     if grep -q "^  $service_name:" "$file"; then
+#       # Extract profile name
+#       profile_name=$(awk -v service="$service_name" '$1 == service":" { getline; getline; print $3 }' "$file")
+#       profile_name="${profile_name#- }"
+#       profile_name="${profile_name%\"}"
+#       profile_name="${profile_name#\"}"
+#       if [[ ! -z "$profile_name" ]]; then
+#         profile="--profile $profile_name"
+#       fi
+#       break
+#     fi
+#   done
+
+#   # Run the docker-compose command
+#   docker-compose $profile $command "$service_name" "$@"
+# }
+
+function docker-network() {
+  docker ps -q | xargs -n 1 docker inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}} {{ .Name }}' | sed 's/ \// /' | sort
+}
+
+dpup() {
+  pushd "$DOCKER_COMPOSE_DIR" || return
+  docker-compose --profile "$1" up -d "$1"
+  echo "----"
+  docker logs -f "$1"
+  popd
+}
+
+# Run docker-compose profiles on a remote (ssh) server
+nas_dcup() {
+  local server="$1"
+  local profile="$2"
+  local service="$3"
+  local command="$4"
+
+  ssh "$server" "cd ${DOCKER_COMPOSE_DIR} && docker-compose --profile ${profile} ${command} ${service}"
+}
+
+# Yazi https://github.com/sxyazi/yazi
+# https://github.com/sxyazi/yazi/tree/main/config/docs
+function y() {
+  tmp="$(mktemp -t "yazi-cwd.XXXXX")"
+  yazi --cwd-file="$tmp"
+  if cwd="$(cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
+    cd -- "$cwd"
+  fi
+  rm -f -- "$tmp"
+}
+
+function brewbackup() {
+  # shellcheck disable=SC2139,SC2153
+  brew bundle dump --force --file="${THIS_DIRECTORY}/Brewfile-${HOST}"
+}
diff --git a/Brewfile-samm-digio-mbp.local b/Brewfile-samm-digio-mbp.local
index 17fd785..3b5bb5e 100644
--- a/Brewfile-samm-digio-mbp.local
+++ b/Brewfile-samm-digio-mbp.local
@@ -14,6 +14,7 @@ tap "homebrew/cask-fonts"
 tap "ibotta/public"
 tap "jeffreywildman/virt-manager"
 tap "jesseduffield/lazydocker"
+tap "jstkdng/programs"
 tap "kubecolor/tap"
 tap "lindell/multi-gitter"
 tap "makew0rld/tap"
@@ -155,10 +156,12 @@ brew "exercism"
 brew "fd"
 brew "sdl2"
 brew "ffmpeg"
+brew "ffmpegthumbnailer"
 brew "gcc"
 brew "fftw"
 brew "fio"
 brew "fnm"
+brew "fx"
 brew "fzf"
 brew "gawk"
 brew "genext2fs"
@@ -249,6 +252,7 @@ brew "parallel"
 brew "pipx"
 brew "platformio"
 brew "podman"
+brew "poppler"
 brew "popt"
 brew "pre-commit", link: false
 brew "prettier"
@@ -285,7 +289,6 @@ brew "texi2html"
 brew "tfenv"
 brew "tflint"
 brew "tfsec"
-brew "thefuck"
 brew "tig"
 brew "tldr"
 brew "tmate"
@@ -295,6 +298,7 @@ brew "trivy"
 brew "ttyd"
 brew "typescript"
 brew "u-boot-tools"
+brew "unar"
 brew "universal-ctags"
 brew "vale"
 brew "vivid"
@@ -307,11 +311,13 @@ brew "wxwidgets"
 brew "x86_64-elf-gdb"
 brew "yarn"
 brew "yasm"
+brew "yazi"
 brew "ykman"
 brew "youtube-dl"
 brew "yq"
 brew "yt-dlp"
 brew "zlib"
+brew "zoxide"
 brew "zsh"
 brew "zsh-autosuggestions"
 brew "zsh-completions"
@@ -326,6 +332,7 @@ brew "derailed/popeye/popeye"
 brew "git-chglog/git-chglog/git-chglog"
 brew "ibotta/public/sopstool"
 brew "jeffreywildman/virt-manager/virt-viewer"
+brew "jstkdng/programs/ueberzugpp"
 brew "kubecolor/tap/kubecolor"
 brew "lindell/multi-gitter/multi-gitter"
 brew "makew0rld/tap/didder"
@@ -355,13 +362,16 @@ cask "drawio"
 cask "drivedx"
 cask "etrecheckpro"
 cask "fedora-media-writer"
+cask "font-b612-mono"
 cask "font-blex-mono-nerd-font"
 cask "font-hack-nerd-font"
 cask "font-iosevka"
 cask "font-monocraft"
+cask "font-symbols-only-nerd-font"
 cask "gitahead"
 cask "hex-fiend"
 cask "kekaexternalhelper"
+cask "keyclu"
 cask "kindle-previewer"
 cask "knockknock"
 cask "latest"
@@ -402,7 +412,6 @@ cask "virtualbuddy"
 cask "webpquicklook"
 cask "wine-stable"
 cask "wineskin"
-cask "xbar"
 cask "xld"
 mas "Amphetamine", id: 937984704
 mas "Apple Configurator", id: 1037126344
@@ -473,6 +482,7 @@ vscode "Cardinal90.multi-cursor-case-preserve"
 vscode "charliermarsh.ruff"
 vscode "chouzz.vscode-better-align"
 vscode "chris-towles.markdown-paste-image"
+vscode "chrisbibby.hide-node-modules"
 vscode "christian-kohler.npm-intellisense"
 vscode "christian-kohler.path-intellisense"
 vscode "chrmarti.regex"
@@ -498,9 +508,11 @@ vscode "esbenp.prettier-vscode"
 vscode "ESPHome.esphome-vscode"
 vscode "espressif.esp-idf-extension"
 vscode "file-icons.file-icons"
+vscode "fivethree.vscode-hugo-snippets"
 vscode "formulahendry.auto-close-tag"
 vscode "formulahendry.github-actions"
 vscode "foxundermoon.shell-format"
+vscode "geddski.macros"
 vscode "GitHub.copilot"
 vscode "GitHub.copilot-chat"
 vscode "GitHub.copilot-labs"
@@ -512,10 +524,11 @@ vscode "GraphQL.vscode-graphql"
 vscode "GraphQL.vscode-graphql-syntax"
 vscode "griimick.vhs"
 vscode "Gruntfuggly.todo-tree"
+vscode "hashicorp.terraform"
 vscode "hbenl.vscode-test-explorer"
 vscode "hediet.vscode-drawio"
 vscode "hilleer.yaml-plus-json"
-vscode "HuggingFace.huggingface-vscode"
+vscode "HitkoDev.vscode-remark-hugo"
 vscode "IBM.output-colorizer"
 vscode "idleberg.applescript"
 vscode "inercia.vscode-k3d"
@@ -523,6 +536,7 @@ vscode "janisdd.vscode-edit-csv"
 vscode "jasonnutter.vscode-codeowners"
 vscode "jebbs.plantuml"
 vscode "jeff-hykin.better-dockerfile-syntax"
+vscode "jerrygoyal.shortcut-menu-bar"
 vscode "johnsoncodehk.vscode-tsconfig-helper"
 vscode "jsynowiec.vscode-insertdatestring"
 vscode "kaellarkin.hugo-shortcode-syntax"
@@ -530,11 +544,14 @@ vscode "kakumei.ts-debug"
 vscode "kasraghoreyshi.json-type-generator"
 vscode "kddejong.vscode-cfn-lint"
 vscode "keesschollaart.vscode-home-assistant"
+vscode "kkangmj.vscode-markdown-extension"
+vscode "Leathong.openscad-language-support"
 vscode "liviuschera.noctis"
 vscode "loganarnett.lambda-snippets"
 vscode "lostintangent.vsls-whiteboard"
 vscode "LouisWT.regexp-preview"
 vscode "mads-hartmann.bash-ide-vscode"
+vscode "mariomatheu.syntax-project-pbxproj"
 vscode "MariusAlchimavicius.json-to-ts"
 vscode "mark-tucker.aws-cli-configure"
 vscode "me-dutour-mathieu.vscode-github-actions"
@@ -547,6 +564,7 @@ vscode "mohsen1.prettify-json"
 vscode "mrmlnc.vscode-duplicate"
 vscode "ms-azuretools.vscode-docker"
 vscode "ms-kubernetes-tools.vscode-kubernetes-tools"
+vscode "ms-python.isort"
 vscode "ms-python.python"
 vscode "ms-python.vscode-pylance"
 vscode "ms-vscode-remote.remote-containers"
@@ -574,11 +592,14 @@ vscode "oven.bun-vscode"
 vscode "paragdiwan.gitpatch"
 vscode "PascalReitermann93.vscode-yaml-sort"
 vscode "paulober.pico-w-go"
+vscode "pflannery.vscode-versionlens"
+vscode "phoenisx.gohugo"
 vscode "platformio.platformio-ide"
 vscode "pmneo.tsimporter"
 vscode "pombadev.pbbs"
 vscode "pomdtr.excalidraw-editor"
 vscode "PulkitGangwar.nextjs-snippets"
+vscode "q.typescript-mono-repo-import-helper"
 vscode "qcz.text-power-tools"
 vscode "quicktype.quicktype"
 vscode "rangav.vscode-thunder-client"
@@ -588,10 +609,14 @@ vscode "redhat.vscode-yaml"
 vscode "richie5um2.vscode-sort-json"
 vscode "robertrossmann.remedy"
 vscode "rusnasonov.vscode-hugo"
+vscode "rvest.vs-code-prettier-eslint"
+vscode "sdras.vue-vscode-snippets"
 vscode "SebastianBille.iam-legend"
 vscode "sidneys1.gitconfig"
 vscode "smallcloud.codify"
+vscode "smallcloud.refact"
 vscode "snyk-security.snyk-vulnerability-scanner"
+vscode "sswg.swift-lang"
 vscode "stateful.runme"
 vscode "steoates.autoimport"
 vscode "streetsidesoftware.code-spell-checker"
@@ -602,6 +627,7 @@ vscode "tal7aouy.theme"
 vscode "tamasfe.even-better-toml"
 vscode "thomascsd.vscode-readme-pattern"
 vscode "timonwong.shellcheck"
+vscode "tsandall.opa"
 vscode "tumido.cron-explained"
 vscode "twxs.cmake"
 vscode "usernamehw.errorlens"
@@ -610,10 +636,13 @@ vscode "VisualStudioExptTeam.intellicode-api-usage-examples"
 vscode "VisualStudioExptTeam.vscodeintellicode"
 vscode "vscode-icons-team.vscode-icons"
 vscode "vsls-contrib.gatekeeper"
+vscode "Vue.volar"
 vscode "wayou.vscode-todo-highlight"
 vscode "wfurphy.vscode-button-card-js"
 vscode "wholroyd.jinja"
 vscode "wix.vscode-import-cost"
+vscode "XadillaX.viml"
+vscode "xuanli.spice"
 vscode "yoavbls.pretty-ts-errors"
 vscode "yzhang.markdown-all-in-one"
 vscode "ZainChen.json"
diff --git a/Brewfile-samm-digio-mbp.local.cattledip.com b/Brewfile-samm-digio-mbp.local.cattledip.com
deleted file mode 100644
index 9d09bcd..0000000
--- a/Brewfile-samm-digio-mbp.local.cattledip.com
+++ /dev/null
@@ -1,618 +0,0 @@
-tap "1password/tap"
-tap "alexanderwillner/tap"
-tap "aws/tap"
-tap "borgbackup/tap"
-tap "charmbracelet/tap"
-tap "creativeprojects/tap"
-tap "derailed/popeye"
-tap "gcenx/wine"
-tap "git-chglog/git-chglog"
-tap "hidetatz/tap"
-tap "homebrew/bundle"
-tap "homebrew/cask-drivers"
-tap "homebrew/cask-fonts"
-tap "ibotta/public"
-tap "jeffreywildman/virt-manager"
-tap "jesseduffield/lazydocker"
-tap "kubecolor/tap"
-tap "lindell/multi-gitter"
-tap "makew0rld/tap"
-tap "minacle/chntpw"
-tap "noahgorstein/tap"
-tap "null-dev/firefox-profile-switcher"
-tap "osx-cross/arm"
-tap "osx-cross/avr"
-tap "oven-sh/bun"
-tap "owenthereal/upterm"
-tap "popcorn-official/popcorn-desktop", "https://github.com/popcorn-official/popcorn-desktop.git"
-tap "qmk/qmk"
-tap "rs/tap"
-tap "rukenshia/repo"
-tap "sidneys/homebrew"
-tap "slp/krun"
-tap "snyk/tap"
-tap "tdsmith/ham"
-tap "versent/taps"
-tap "wader/tap"
-brew "act"
-brew "actionlint"
-brew "adns"
-brew "ca-certificates"
-brew "gdbm"
-brew "gettext"
-brew "libffi"
-brew "pkg-config"
-brew "mpdecimal"
-brew "openssl@1.1"
-brew "openssl@3"
-brew "readline"
-brew "sqlite"
-brew "xz"
-brew "python@3.9"
-brew "cairo"
-brew "lz4"
-brew "zstd"
-brew "libtiff"
-brew "gdk-pixbuf"
-brew "pango"
-brew "librsvg"
-brew "adwaita-icon-theme"
-brew "amazon-ecs-cli"
-brew "libyaml"
-brew "ansible"
-brew "aom"
-brew "arduino-cli"
-brew "aria2"
-brew "m4"
-brew "autoconf"
-brew "automake"
-brew "gmp"
-brew "coreutils"
-brew "libtool"
-brew "asdf"
-brew "autoenv"
-brew "hidapi"
-brew "libusb"
-brew "libftdi"
-brew "libusb-compat"
-brew "avrdude"
-brew "c-ares"
-brew "libnghttp2"
-brew "node"
-brew "aws-cdk"
-brew "aws-iam-authenticator"
-brew "aws-nuke"
-brew "aws-shell"
-brew "aws-sso-util"
-brew "awscli"
-brew "bash"
-brew "bash-completion"
-brew "bat"
-brew "bats-core"
-brew "bdw-gc"
-brew "binutils"
-brew "blueutil"
-brew "borgmatic"
-brew "c-blosc"
-brew "cabextract"
-brew "ccache"
-brew "cdrtools"
-brew "cereal"
-brew "certbot"
-brew "cfn-lint"
-brew "cgal"
-brew "chain-bench"
-brew "charm"
-brew "cheat"
-brew "checkov"
-brew "chkrootkit"
-brew "circumflex"
-brew "cjson"
-brew "jansson"
-brew "libmagic"
-brew "protobuf", link: false
-brew "clamav"
-brew "cli53"
-brew "cmake"
-brew "cmocka"
-brew "libevent"
-brew "libunistring"
-brew "libidn2"
-brew "libtasn1"
-brew "nettle"
-brew "p11-kit"
-brew "unbound"
-brew "gnutls"
-brew "libslirp"
-brew "libssh"
-brew "qemu"
-brew "colima"
-brew "libev"
-brew "comby"
-brew "ctop"
-brew "rtmpdump"
-brew "curl", args: ["HEAD"]
-brew "dash"
-brew "dav1d"
-brew "detect-secrets"
-brew "dfu-util"
-brew "diff-so-fancy"
-brew "direnv"
-brew "dive"
-brew "dnstop"
-brew "docker"
-brew "docker-buildx"
-brew "docker-compose"
-brew "docker-credential-helper"
-brew "docker-slim"
-brew "duf"
-brew "e2fsprogs"
-brew "eksctl"
-brew "entr"
-brew "esptool"
-brew "exa"
-brew "exercism"
-brew "fd"
-brew "sdl2"
-brew "ffmpeg"
-brew "gcc"
-brew "fftw"
-brew "fio"
-brew "fnm"
-brew "fzf"
-brew "gawk"
-brew "genext2fs"
-brew "gh"
-brew "libidn"
-brew "git"
-brew "git-delta"
-brew "git-lfs"
-brew "git-quick-stats"
-brew "git-secrets"
-brew "gitleaks"
-brew "gitui"
-brew "glow"
-brew "gnu-getopt"
-brew "gnu-sed"
-brew "libgpg-error"
-brew "libassuan"
-brew "libgcrypt"
-brew "libksba"
-brew "npth"
-brew "pinentry"
-brew "gnupg"
-brew "go"
-brew "graphviz"
-brew "grep"
-brew "gron"
-brew "gtk+3"
-brew "gtk4"
-brew "py3cairo"
-brew "pygobject3"
-brew "guile"
-brew "hadolint"
-brew "handbrake"
-brew "helm"
-brew "htop"
-brew "hub"
-brew "hugo"
-brew "hyperfine"
-brew "icdiff"
-brew "iftop"
-brew "ilmbase"
-brew "libheif"
-brew "imagemagick"
-brew "imessage-exporter"
-brew "iperf3"
-brew "jc"
-brew "jemalloc"
-brew "jq"
-brew "jsonlint"
-brew "k3d"
-brew "k9s"
-brew "kind"
-brew "kompose"
-brew "kubernetes-cli"
-brew "kube-ps1"
-brew "lazydocker"
-brew "lazygit"
-brew "lftp"
-brew "libcroco"
-brew "libmaxminddb"
-brew "librtlsdr"
-brew "libsmi"
-brew "links"
-brew "localstack"
-brew "lua"
-brew "lua@5.1"
-brew "macpine"
-brew "mas"
-brew "ninja"
-brew "meson"
-brew "mkvtoolnix"
-brew "msgpack"
-brew "mtr"
-brew "nasm"
-brew "ncdu"
-brew "nghttp2"
-brew "nlopt"
-brew "nmap"
-brew "openblas"
-brew "nushell"
-brew "ollama"
-brew "tbb"
-brew "openvdb"
-brew "p7zip"
-brew "packer-completion"
-brew "pandoc"
-brew "parallel"
-brew "pipx"
-brew "platformio"
-brew "podman"
-brew "popt"
-brew "pre-commit", link: false
-brew "prettier"
-brew "progress"
-brew "pyenv"
-brew "pygitup"
-brew "qt@5"
-brew "pyqt@5", link: false
-brew "python@3.8"
-brew "restic"
-brew "ripgrep"
-brew "rsync"
-brew "rust"
-brew "rustup-init"
-brew "s3cmd"
-brew "saml2aws"
-brew "scipy"
-brew "screen"
-brew "semgrep"
-brew "shellcheck"
-brew "shfmt"
-brew "siege"
-brew "slacknimate"
-brew "socat"
-brew "sops"
-brew "speedtest-cli"
-brew "tcping"
-brew "telnet"
-brew "terraform-docs"
-brew "terraform-ls"
-brew "terraformer"
-brew "testssl"
-brew "texi2html"
-brew "tfenv"
-brew "tflint"
-brew "tfsec"
-brew "thefuck"
-brew "tig"
-brew "tldr"
-brew "tmate"
-brew "tmux"
-brew "tree"
-brew "trivy"
-brew "ttyd"
-brew "typescript"
-brew "u-boot-tools"
-brew "universal-ctags"
-brew "vale"
-brew "vivid"
-brew "weasyprint"
-brew "wget"
-brew "whalebrew"
-brew "wimlib"
-brew "winetricks"
-brew "wxwidgets"
-brew "x86_64-elf-gdb"
-brew "yarn"
-brew "yasm"
-brew "ykman"
-brew "youtube-dl"
-brew "yq"
-brew "yt-dlp"
-brew "zlib"
-brew "zsh"
-brew "zsh-autosuggestions"
-brew "zsh-completions"
-brew "zsh-history-substring-search"
-brew "alexanderwillner/tap/things.sh"
-brew "borgbackup/tap/borgbackup-fuse"
-brew "charmbracelet/tap/gum"
-brew "charmbracelet/tap/mods"
-brew "charmbracelet/tap/vhs"
-brew "creativeprojects/tap/resticprofile"
-brew "derailed/popeye/popeye"
-brew "git-chglog/git-chglog/git-chglog"
-brew "ibotta/public/sopstool"
-brew "jeffreywildman/virt-manager/virt-viewer"
-brew "kubecolor/tap/kubecolor"
-brew "lindell/multi-gitter/multi-gitter"
-brew "makew0rld/tap/didder"
-brew "minacle/chntpw/chntpw"
-brew "noahgorstein/tap/jqp"
-brew "oven-sh/bun/bun"
-brew "owenthereal/upterm/upterm"
-brew "qmk/qmk/qmk"
-brew "rs/tap/dnstrace"
-brew "slp/krun/buildah"
-brew "slp/krun/krunvm"
-brew "snyk/tap/snyk"
-brew "wader/tap/fq"
-cask "androidtool"
-cask "apparency"
-cask "appcleaner"
-cask "applite"
-cask "balenaetcher"
-cask "betterdisplay"
-cask "calibre"
-cask "chromium"
-cask "crystalfetch"
-cask "cubicsdr"
-cask "db-browser-for-sqlite"
-cask "devtoys"
-cask "drawio"
-cask "drivedx"
-cask "etrecheckpro"
-cask "fedora-media-writer"
-cask "font-blex-mono-nerd-font"
-cask "font-hack-nerd-font"
-cask "font-iosevka"
-cask "font-monocraft"
-cask "gitahead"
-cask "hex-fiend"
-cask "kekaexternalhelper"
-cask "kindle-previewer"
-cask "knockknock"
-cask "latest"
-cask "launchrocket"
-cask "libreoffice"
-cask "losslesscut"
-cask "maccy"
-cask "macdown"
-cask "macfuse"
-cask "mambaforge"
-cask "meshlab"
-cask "microsoft-teams"
-cask "monodraw"
-cask "ngrok"
-cask "onyx"
-cask "paintbrush"
-cask "pdfshaver"
-cask "playonmac"
-cask "qbittorrent"
-cask "qlstephen"
-cask "qlvideo"
-cask "qmk-toolbox"
-cask "scratch"
-cask "secretive"
-cask "sekey"
-cask "serial"
-cask "session-manager-plugin"
-cask "shortcat"
-cask "shottr"
-cask "sloth"
-cask "soulseek"
-cask "stay"
-cask "syncthing"
-cask "thonny"
-cask "utm"
-cask "via"
-cask "virtualbuddy"
-cask "webpquicklook"
-cask "wine-stable"
-cask "wineskin"
-cask "xbar"
-cask "xld"
-mas "Amphetamine", id: 937984704
-mas "Apple Configurator", id: 1037126344
-mas "AudioBookBinder", id: 413969927
-mas "Bear", id: 1091189122
-mas "Bitdefender Virus Scanner", id: 500154009
-mas "Bumpr", id: 1166066070
-mas "Curve", id: 1219074514
-mas "DaisyDisk", id: 411643860
-mas "DevCleaner", id: 1388020431
-mas "Disk Speed Test", id: 425264550
-mas "Duplicate File Finder", id: 1032755628
-mas "Health Auto Export", id: 1115567069
-mas "iA Writer", id: 775737590
-mas "iMovie", id: 408981434
-mas "Keka", id: 470158793
-mas "Keynote", id: 409183694
-mas "MeetingBar", id: 1532419400
-mas "Meme Generator", id: 483350546
-mas "Micro Snitch", id: 972028355
-mas "Music Tag Edit", id: 999242964
-mas "MusicHarbor", id: 1440405750
-mas "NepTunes", id: 1006739057
-mas "Numbers", id: 409203825
-mas "NZB Control", id: 1048732801
-mas "Pages", id: 409201541
-mas "Parcel", id: 639968404
-mas "Peek", id: 1554235898
-mas "Photomator", id: 1444636541
-mas "Pixelmator Pro", id: 1289583905
-mas "Reeder", id: 1529448980
-mas "Remote Desktop", id: 409907375
-mas "ScreenBrush", id: 1233965871
-mas "Slack", id: 803453959
-mas "Strongbox", id: 897283731
-mas "Table Tool", id: 1122008420
-mas "Tailscale", id: 1475387142
-mas "TestFlight", id: 899247664
-mas "Things", id: 904280696
-mas "WhatsApp", id: 1147396723
-mas "Xcode", id: 497799835
-mas "Yubico Authenticator", id: 1497506650
-vscode "aaron-bond.better-comments"
-vscode "adamhartford.vscode-base64"
-vscode "adzero.vscode-sievehighlight"
-vscode "aeresov.klipper-config"
-vscode "ahmadalli.vscode-nginx-conf"
-vscode "akmittal.hugofy"
-vscode "alefragnani.Bookmarks"
-vscode "alefragnani.project-manager"
-vscode "alefragnani.rtf"
-vscode "amazonwebservices.aws-toolkit-vscode"
-vscode "appliedengdesign.vscode-gcode-syntax"
-vscode "assisrMatheus.sidebar-markdown-notes"
-vscode "AykutSarac.jsoncrack-vscode"
-vscode "BateleurIO.vscode-combine-scripts"
-vscode "bceskavich.theme-dracula-at-night"
-vscode "bdavs.expect"
-vscode "berublan.vscode-log-viewer"
-vscode "bierner.docs-view"
-vscode "bierner.emojisense"
-vscode "bierner.markdown-mermaid"
-vscode "blackmist.LinkCheckMD"
-vscode "bpruitt-goddard.mermaid-markdown-syntax-highlighting"
-vscode "budparr.language-hugo-vscode"
-vscode "byi8220.indented-block-highlighting"
-vscode "Cardinal90.multi-cursor-case-preserve"
-vscode "charliermarsh.ruff"
-vscode "chouzz.vscode-better-align"
-vscode "chris-towles.markdown-paste-image"
-vscode "christian-kohler.npm-intellisense"
-vscode "christian-kohler.path-intellisense"
-vscode "chrmarti.regex"
-vscode "Continue.continue"
-vscode "coolbear.systemd-unit-file"
-vscode "curdeveryday.vscode-m5stack-mpy"
-vscode "DanielThielking.aws-cloudformation-yaml"
-vscode "dannysteenman.cdk-snippets"
-vscode "dannysteenman.cloudformation-yaml-snippets"
-vscode "darkriszty.markdown-table-prettify"
-vscode "DavidAnson.vscode-markdownlint"
-vscode "dbaeumer.vscode-eslint"
-vscode "dnicolson.binary-plist"
-vscode "dpkristensen-garmin.udev-rules"
-vscode "dracula-theme.theme-dracula"
-vscode "drcallaway.vscode-surround-with"
-vscode "eamodio.gitlens"
-vscode "EditorConfig.EditorConfig"
-vscode "elagil.pre-commit-helper"
-vscode "emilast.LogFileHighlighter"
-vscode "equinusocio.vsc-material-theme-icons"
-vscode "esbenp.prettier-vscode"
-vscode "ESPHome.esphome-vscode"
-vscode "espressif.esp-idf-extension"
-vscode "file-icons.file-icons"
-vscode "formulahendry.auto-close-tag"
-vscode "formulahendry.github-actions"
-vscode "foxundermoon.shell-format"
-vscode "GitHub.copilot"
-vscode "GitHub.copilot-chat"
-vscode "GitHub.copilot-labs"
-vscode "GitHub.remotehub"
-vscode "github.vscode-github-actions"
-vscode "GitHub.vscode-pull-request-github"
-vscode "golang.go"
-vscode "GraphQL.vscode-graphql"
-vscode "GraphQL.vscode-graphql-syntax"
-vscode "griimick.vhs"
-vscode "Gruntfuggly.todo-tree"
-vscode "hbenl.vscode-test-explorer"
-vscode "hediet.vscode-drawio"
-vscode "hilleer.yaml-plus-json"
-vscode "HuggingFace.huggingface-vscode"
-vscode "IBM.output-colorizer"
-vscode "idleberg.applescript"
-vscode "inercia.vscode-k3d"
-vscode "janisdd.vscode-edit-csv"
-vscode "jasonnutter.vscode-codeowners"
-vscode "jebbs.plantuml"
-vscode "jeff-hykin.better-dockerfile-syntax"
-vscode "johnsoncodehk.vscode-tsconfig-helper"
-vscode "jsynowiec.vscode-insertdatestring"
-vscode "kaellarkin.hugo-shortcode-syntax"
-vscode "kakumei.ts-debug"
-vscode "kasraghoreyshi.json-type-generator"
-vscode "kddejong.vscode-cfn-lint"
-vscode "keesschollaart.vscode-home-assistant"
-vscode "liviuschera.noctis"
-vscode "loganarnett.lambda-snippets"
-vscode "lostintangent.vsls-whiteboard"
-vscode "LouisWT.regexp-preview"
-vscode "mads-hartmann.bash-ide-vscode"
-vscode "MariusAlchimavicius.json-to-ts"
-vscode "mark-tucker.aws-cli-configure"
-vscode "me-dutour-mathieu.vscode-github-actions"
-vscode "mechatroner.rainbow-csv"
-vscode "meganrogge.template-string-converter"
-vscode "mehyaa.workspace-storage-cleanup"
-vscode "mikestead.dotenv"
-vscode "mklein.cdk-snippets"
-vscode "mohsen1.prettify-json"
-vscode "mrmlnc.vscode-duplicate"
-vscode "ms-azuretools.vscode-docker"
-vscode "ms-kubernetes-tools.vscode-kubernetes-tools"
-vscode "ms-python.python"
-vscode "ms-python.vscode-pylance"
-vscode "ms-vscode-remote.remote-containers"
-vscode "ms-vscode-remote.remote-ssh"
-vscode "ms-vscode-remote.remote-ssh-edit"
-vscode "ms-vscode.cmake-tools"
-vscode "ms-vscode.cpptools"
-vscode "ms-vscode.cpptools-extension-pack"
-vscode "ms-vscode.live-server"
-vscode "ms-vscode.makefile-tools"
-vscode "ms-vscode.remote-explorer"
-vscode "ms-vscode.remote-repositories"
-vscode "ms-vscode.test-adapter-converter"
-vscode "ms-vscode.vscode-typescript-next"
-vscode "ms-vsliveshare.vsliveshare"
-vscode "msjsdiag.vscode-react-native"
-vscode "mskelton.npm-outdated"
-vscode "mushan.vscode-open-iterm2"
-vscode "naumovs.color-highlight"
-vscode "oderwat.indent-rainbow"
-vscode "OmarTawfik.github-actions-vscode"
-vscode "Orta.vscode-jest"
-vscode "ottostreifel.cloudbuild-helper"
-vscode "paragdiwan.gitpatch"
-vscode "PascalReitermann93.vscode-yaml-sort"
-vscode "paulober.pico-w-go"
-vscode "platformio.platformio-ide"
-vscode "pmneo.tsimporter"
-vscode "pombadev.pbbs"
-vscode "pomdtr.excalidraw-editor"
-vscode "PulkitGangwar.nextjs-snippets"
-vscode "qcz.text-power-tools"
-vscode "quicktype.quicktype"
-vscode "rangav.vscode-thunder-client"
-vscode "raynigon.nginx-formatter"
-vscode "redhat.vscode-xml"
-vscode "redhat.vscode-yaml"
-vscode "richie5um2.vscode-sort-json"
-vscode "robertrossmann.remedy"
-vscode "rusnasonov.vscode-hugo"
-vscode "SebastianBille.iam-legend"
-vscode "sidneys1.gitconfig"
-vscode "smallcloud.codify"
-vscode "snyk-security.snyk-vulnerability-scanner"
-vscode "stateful.runme"
-vscode "steoates.autoimport"
-vscode "streetsidesoftware.code-spell-checker"
-vscode "stuart.unique-window-colors"
-vscode "Syler.ignore"
-vscode "TakumiI.markdowntable"
-vscode "tal7aouy.theme"
-vscode "tamasfe.even-better-toml"
-vscode "thomascsd.vscode-readme-pattern"
-vscode "timonwong.shellcheck"
-vscode "tumido.cron-explained"
-vscode "twxs.cmake"
-vscode "usernamehw.errorlens"
-vscode "vadimcn.vscode-lldb"
-vscode "VisualStudioExptTeam.intellicode-api-usage-examples"
-vscode "VisualStudioExptTeam.vscodeintellicode"
-vscode "vscode-icons-team.vscode-icons"
-vscode "vsls-contrib.gatekeeper"
-vscode "wayou.vscode-todo-highlight"
-vscode "wfurphy.vscode-button-card-js"
-vscode "wholroyd.jinja"
-vscode "wix.vscode-import-cost"
-vscode "yoavbls.pretty-ts-errors"
-vscode "yzhang.markdown-all-in-one"
-vscode "ZainChen.json"
diff --git a/bootstrap_shell.sh b/bootstrap_shell.sh
index 4170e9a..56fa3de 100755
--- a/bootstrap_shell.sh
+++ b/bootstrap_shell.sh
@@ -150,6 +150,7 @@ chmod +x ~/.docker/cli-plugins/docker-compose
 ln -sfn /opt/homebrew/opt/docker-compose/bin/docker-compose "${HOME}/.docker/cli-plugins/docker-compose"
 ####
 
+mkdir -p "${HOME}/.zsh.d"
 grep -q -F '/opt/homebrew/bin/zsh' /etc/shells || echo '/opt/homebrew/bin/zsh' | sudo tee -a /etc/shells
 
 clone_repo "${HOME}/.zgen" "https://github.com/tarjoilija/zgen.git"