Latest

2023-06-19 03:30:41 +00:00 · 2023-06-19 03:30:41 +00:00 · 44f32824e7
commit 44f32824e7
parent 8b0e897e56
26 changed files with 373 additions and 270 deletions
--- a/docs/INSPIRATION.md
+++ b/docs/INSPIRATION.md
@ -0,0 +1,29 @@
+## CLI
+
+* https://github.com/r-darwish/idnt
+* https://github.com/charmbracelet/wish
+* https://github.com/charmbracelet/skate
+* https://github.com/console-rs/indicatif
+* https://github.com/tauri-apps/tauri
+* https://github.com/emilengler/sysget
+* https://github.com/pocketbase/pocketbase
+* sysget
+* https://github.com/therootcompany/serviceman
+* https://github.com/vadimdemedes/ink
+* https://github.com/ajenti/ajenti
+* https://github.com/linuxserver/docker-webtop
+* https://github.com/chocolatey/boxstarter
+
+## System
+
+* https://github.com/Andy-Python-Programmer/aero
+
+## Website
+
+* https://github.com/Mintplex-Labs/anything-llm
+* https://webcontainers.io/
+* https://github.com/zulip/zulip
+* https://github.com/ConvoyPanel/panel
+* https://github.com/coder/coder
+* https://github.com/rigoneri/syte
+* https://github.com/rigoneri/Syte3
--- a/docs/TODO.md
+++ b/docs/TODO.md
@ -1,28 +1,6 @@
-Integrate into PowerShell profile.ps1: https://github.com/dahlbyk/posh-git
-
 # TODOs

-
-* Revisit https://github.com/rome/tools when project matures
-https://github.com/rigoneri/syte/graphs/code-frequency
-https://www.automated-bots.com/
-https://github.com/NathanDuma/LinkedIn-Easy-Apply-Bot
-https://github.com/hfreire/get-me-a-date
-https://github.com/joelbarmettlerUZH/auto-tinder
-https://github.com/coder/coder
-zsh completions have been installed to:
-  /usr/local/share/zsh/site-functions
-  ==> Linking Binary 'completion.bash.inc' to '/usr/local/etc/bash_completion.d/google-cloud-sdk'
-==> Linking Binary 'completion.zsh.inc' to '/usr/local/share/zsh/site-functions/_google_cloud_sdk'
-Ansible roles
-https://github.com/altermo/vim-plugin-list
-Play with Navi and configure cheat repos
-https://github.com/kelleyma49/PSFzf
-https://github.com/jdhitsolutions/PSScriptTools
-https://github.com/devblackops/Terminal-Icons
-https://github.com/dfinke/ImportExcel
-https://github.com/Disassembler0/Win10-Initial-Setup-Script
-https://github.com/mandiant/flare-vm
+* Configure Navi to automatically download and use the best cheat repositories

 ## Pending

@ -31,115 +9,18 @@ https://github.com/mandiant/flare-vm
 * Consider integrating [LocalAI](https://github.com/go-skynet/LocalAI) which can be used in combination with mods to generate ChatGPT responses locally
 * Wait for Homebrew install option for [Warpgate](https://github.com/warp-tech/warpgate)
 * Wait for https://github.com/hocus-dev/hocus to get out of alpha for VM management
-
-## Premium Software Recommendations
-
-### macOS
-
-* [Dato](https://apps.apple.com/app/id1470584107) - World clocks and calendar menu bar application available for macOS. It is a better, paid alternative to the free version of Clockr which is currently installed using the default configuration of Install Doctor.
-* [Parallels](https://www.parallels.com/) is the best virtualization manager / platform available on macOS
-
-
-
-
-# https://github.com/mergestat/mergestat
-# Tiltfile
-# Skate!
-# RUNDECK
-# Foreman?
-# FOG
-# AMANDA
-# CloudStack
-# AppScale
-# resilio connect
-# oVirt
-# opennebula
-# emailengine.app
-# Consider:
- https://marketplace.visualstudio.com/items?itemName=asvetliakov.vscode-neovim
-CLOUDFLARE_API_TOKEN
-GMAIL_APP_PASSWORD
-### Ensure these PATHs are added on Windows
-
-add to PATH:
-'%ProgramFiles(x86)%\mitmproxy\bin'
-'%ProgramFiles(x86)%\juju'
-
-# https://github.com/graysky2/profile-cleaner
-
-### POSSIBLY USEFUL SOFTWARE
-
- Incorporate /home/linuxbrew/.linuxbrew/etc/bash_completion.d
- https://docs.brew.sh/Shell-Completion
-
-[Polyform License Example](https://github.com/dosyago/DiskerNet/blob/fun/LICENSE.md)
-
-### Robocorp.com
-
-https://github.com/rigoneri/Syte3
-
+* Revisit https://github.com/rome/tools when project matures
+* Revisit https://github.com/Disassembler0/Win10-Initial-Setup-Script for initial setup of Windows
+* Revisit Resilio - seems like they have tools useful for synchronizing VMs
+* Consider switching license to [Polyform License Example](https://github.com/dosyago/DiskerNet/blob/fun/LICENSE.md)
 * Look into tile managers
+* https://github.com/joelbarmettlerUZH/auto-tinder
+* https://github.com/hfreire/get-me-a-date

-## Website
-
-* https://github.com/Mintplex-Labs/anything-llm
-* https://webcontainers.io/
-* https://github.com/zulip/zulip
-* https://github.com/ConvoyPanel/panel
-* https://github.com/coder/coder
-
-
-## Kubernetes
-
-* https://github.com/kubevirt/kubevirt
-
-## VM
-
-* https://www.cloudhypervisor.org/
-* https://github.com/boxcutter/macos
-* https://github.com/canonical/ubuntu-desktop-installer
-
-## CLI
-
-* https://github.com/r-darwish/idnt
-* https://github.com/charmbracelet/wish
-* https://github.com/charmbracelet/skate
-* https://github.com/console-rs/indicatif
-* https://github.com/tauri-apps/tauri
-* https://github.com/emilengler/sysget
-* https://github.com/pocketbase/pocketbase
-* sysget
-* https://github.com/therootcompany/serviceman
-* https://github.com/vadimdemedes/ink
-* https://github.com/ajenti/ajenti
-* https://github.com/linuxserver/docker-webtop
-* https://github.com/chocolatey/boxstarter
-
-## System
-
-* Include [vagrant-hostmanager](https://github.com/devopsgroup-io/vagrant-hostmanager) to register IP addresses to `/etc/hosts` files so that they have IP addresses of other machines in the same Vagrant network
-* Possible security improvement https://github.com/containers/toolbox
-* Possible security test - https://github.com/AlessandroZ/LaZagne Windows password system sniffer
-
-## PHP
-
-https://github.com/deployphp/deployer
-
-## Alternative OSes
-
-https://github.com/Andy-Python-Programmer/aero


 ## Go Libraries to Consider

-* https://github.com/ivaaaan/smug
-* https://github.com/arl/gitmux
-* https://github.com/jessfraz/dockfmt
-* https://github.com/lindell/multi-gitter
-* https://github.com/DBCDK/morph
-* https://github.com/buildkite/agent
-* https://github.com/fiatjaf/jiq
-* https://github.com/curusarn/resh
 * https://github.com/git-town/git-town
 * https://github.com/0xERR0R/blocky
 * https://github.com/terraform-linters/tflint
@ -156,7 +37,7 @@ https://github.com/Andy-Python-Programmer/aero
 * https://github.com/xo/usql
 * https://github.com/future-architect/vuls
 * https://github.com/containers/podman
-* https://github.com/derailed/k9s
+* 


 https://www.activepieces.com/docs/install/docker
@ -205,90 +86,77 @@ Fix how terminal output renders on Terminal.app on macOS


 https://github.com/TypeScriptToLua/TypeScriptToLua
-https://github.com/context-labs/autodoc
+

 https://github.com/activepieces/activepieces#
 https://github.com/jupyterlab/jupyterlab-desktop
-https://github.com/alibaba/lightproxy
+
 https://github.com/Kanaries/Rath
 https://github.com/butlerx/wetty
-https://github.com/Nutlope/aicommits
-https://github.com/mixn/carbon-now-cli
+
+
 https://github.com/graphql-editor/graphql-editor
 https://github.com/graphql/graphql-playground
-https://github.com/voidcosmos/npkill
-https://github.com/Raathigesh/majestic
-https://github.com/raineorshine/npm-check-updates

-https://github.com/vercel/serve
-https://github.com/ds300/patch-package
-https://github.com/cs01/gdbgui
-https://github.com/ionic-team/capacitor
-https://github.com/opencv/cvat
+
+
+
+
+
 https://github.com/amplication/amplication
-https://github.com/quicktype/quicktype
-https://github.com/ionic-team/stencil
+https://github.com/veler/DevToys
 https://github.com/openai-translator/openai-translator
-https://github.com/wulkano/Kap
-https://github.com/NativeScript/NativeScript
-https://github.com/ionic-team/ionic-framework
-https://github.com/hoppscotch/hoppscotch
-https://github.com/nestjs/nest
-https://github.com/storybookjs/storybook
-
-https://github.com/praeclarum/Netjs
-https://github.com/PowerShell/GraphicalTools
-https://github.com/PowerShell/PSResourceGet
+https://github.com/lepoco/wpfui
+https://github.com/ModernFlyouts-Community/ModernFlyouts
+https://github.com/purogamer/Fluent-for-Steam
+https://github.com/files-community/Files
 https://github.com/awaescher/RepoZ
-https://github.com/PowerShell/PSScriptAnalyzer
+https://github.com/microsoft/WinUI-Gallery
 https://github.com/sq/JSIL
 https://github.com/dotnet/format
 https://github.com/NuGetPackageExplorer/NuGetPackageExplorer
-https://github.com/anypackage/anypackage
-https://github.com/BornToBeRoot/NETworkManager
+https://github.com/adirh3/Fluent-Search
+https://github.com/Rise-Software/Rise-Media-Player
+https://github.com/vinceliuice/Fluent-gtk-theme
 https://github.com/actions/runner
 https://github.com/hbons/SparkleShare
 https://github.com/gitextensions/gitextensions
 https://github.com/mRemoteNG/mRemoteNG
 https://github.com/MathewSachin/Captura
-https://github.com/felixse/FluentTerminal
+https://github.com/DiscordStyles/Fluent
+https://github.com/Alex4SSB/ADB-Explorer
+
 https://github.com/carlospolop/PEASS-ng

-
-https://github.com/utmapp/UTM
-
-https://github.com/ianyh/Amethyst
-
-https://github.com/lwouis/alt-tab-macos
-https://github.com/ObuchiYuki/DevToysMac
-
-https://github.com/Clipy/Clipy
-
-
-
-
-
-
-https://github.com/halo/LinkLiar
-https://github.com/Mortennn/FiScript
-
-
-
-
-
-
 Add to KDE plugins:
 https://github.com/Bismuth-Forge/bismuth

 ## Docker
-https://github.com/erxes/erxes - CRM
-https://github.com/pawelmalak/flame - Homepage
-https://github.com/thelounge/thelounge - IRC
-https://github.com/vector-im/element-web - Matrix
-https://github.com/outline/outline - Collaborative MD
-https://github.com/nocodb/nocodb - MySQL Spreadsheet
-https://github.com/excalidraw/excalidraw - Hand-drawn Diagrams
-https://github.com/ansible/awx - AWX Ansible Management
+
+* https://github.com/erxes/erxes - CRM
+* https://github.com/pawelmalak/flame - Homepage
+* https://github.com/thelounge/thelounge - IRC
+* https://github.com/vector-im/element-web - Matrix
+* https://github.com/outline/outline - Collaborative MD
+* https://github.com/nocodb/nocodb - MySQL Spreadsheet
+* https://github.com/excalidraw/excalidraw - Hand-drawn Diagrams
+* https://github.com/ansible/awx - AWX Ansible Management
+* https://github.com/mergestat/mergestat - Git SQL Queries
+* https://docs.rundeck.com/docs/administration/install/installing-rundeck.html - Rundeck (Self-Service Desk)
+
+## Bare Metal
+
+* https://theforeman.org/ (VM management)
+* https://fogproject.org/ (Backup solution)
+* https://github.com/apache/cloudstack (VM management)
+* https://www.ovirt.org/ (VM management)
+* https://opennebula.io/ (Hybrid-cloud management)
+* https://github.com/cloud-hypervisor/cloud-hypervisor (Cloud hypervisor)
+
+## Kubernetes
+
+* https://github.com/kubevirt/kubevirt
+* https://atuin.sh/docs/self-hosting/k8s

 ## NoCode Docker Maybe
 https://github.com/illacloud/illa-builder
@ -310,6 +178,7 @@ https://github.com/hoppscotch/hoppscotch
 builder.io
 https://github.com/hocus-dev/hocus
 https://github.com/reworkd/AgentGPT
+cvat.io

 Finish TS from 1400 stars
 Python
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@ -70,6 +70,7 @@ chromeExtensions:
  - grammar-spell-checker-%E2%80%94-l/oldceeleldhonbafppcapldpdifcinji
  - grepper/amaaokahonnfjjemodnpmeenfpnnbkco
  - gsconnect/jfnifeihccihocjbfcfhicmmgpjicaec
+  - hoppscotch-browser-extens/amknoiejhlmhancpahfcfcfhllgkpbld
  - hunter-email-finder-exten/hgmhmanijnjhaffoampdlllchpolkdnj
  - huntr-job-search-tracker/mihdfbecejheednfigjpdacgeilhlmnf
  - hypertype/lohojfppjeknalpoklojhfnndocgekbd
@ -117,6 +118,7 @@ firefoxAddOns:
  - floccus
  - giphy-for-firefox
  - gnome-shell-integration
+  - hoppscotch
  - json-lite
  - languagetool
  - mailvelope
@ -183,7 +185,6 @@ softwareGroups:
    ## - swarm
    ## - vpn
    ## - wsl
-    ## - yubikey
    ## - antivirus
    ## - common
    # - connect
@ -523,6 +524,7 @@ softwareGroups:
  Games-Desktop: &Games-Desktop
    - mudlet # MUD client
  Git: &Git
+    - aicommits
    - commitizen
    - gh
    - gist
@ -540,6 +542,7 @@ softwareGroups:
    - glab
    - hub
    - lazygit
+    - multi-gitter
    - opencommit
    - starred
    - tig
@ -582,6 +585,7 @@ softwareGroups:
    - kubernetes-helm
    - kubernetes-kompose
    - kubeval
+    - k9s
    - linkerd2
    - minikube
    - openshift-cli
@ -591,6 +595,7 @@ softwareGroups:
    - lens
  Linting: &Linting
    - ansible-lint
+    - dockfmt
    - dotenv-linter
    - dprint
    - eslint
@ -603,6 +608,7 @@ softwareGroups:
    - markdownlint-cli
    - prettierd
    - pre-commit
+    - psscriptanalyzer
    - ruff
    - shellcheck
    - shfmt
@ -631,6 +637,7 @@ softwareGroups:
    - wkhtmltopdf
    - youtube-dl
  Media-Desktop: &Media-Desktop
+    - adobe-creative-cloud
    - audacity
    - balenaetcher
    - blender
@ -655,6 +662,7 @@ softwareGroups:
    - _nautilus-extensions
    - cakebrew
    - clocker
+    - devtoys
    - drawio
    - eartrumpet
    - edex-ui
@ -703,6 +711,7 @@ softwareGroups:
    - java
    - libimobiledevice
    - license
+    - lightproxy
    - mono
    - ntl
    - openjdk
@ -758,6 +767,9 @@ softwareGroups:
    - ultra
    - zap
  Productivity-Desktop: &Productivity-Desktop
+    - alt-tab
+    - amethyst
+    - fiscript
    - libreoffice
    - microsoft-office
    - notion
@ -782,6 +794,7 @@ softwareGroups:
    - vhs
  Recording-Desktop: &Recording-Desktop
    - flameshot
+    - kap
    - peek
    - sharex
  Ruby: &Ruby
@ -862,6 +875,7 @@ softwareGroups:
    - winrm-cli
    - wireshark-cli
  Sys-Admin-Desktop: &Sys-Admin-Desktop
+    - networkmanager
    - quasar
    - recuva
    - sloth
@ -897,7 +911,6 @@ softwareGroups:
  Transfer-Desktop: &Transfer-Desktop
    - ariang
    - dat-desktop
-    - filezilla
    - google-drive
    - motrix
    - qbittorrent
@ -920,14 +933,17 @@ softwareGroups:
    - gnome-boxes
    - parallels
    - quickgui
+    - utm
    - vagrant-manager
    - virtualbox
    - vmware
  Web-Development: &Web-Development
    - angular-cli
+    - autodoc
    - auto-install
    - browser-sync
    - caniuse
+    - capacitor
    - coder
    - cordova
    - deno
@ -951,8 +967,10 @@ softwareGroups:
    - jest
    - json-server
    - localtunnel
+    - majestic
    - mitmproxy
    - muffet
+    - nativescript
    - ncc
    - nectar
    - nest
@ -960,20 +978,25 @@ softwareGroups:
    - ngrok
    - node-prune
    - np
-    - npm-check
+    - npkill
+    - npm-check # Similar to npm-check-updates
+    - npm-check-updates
    - oclif
    - package-size
    - page-fetch
    - pageres
+    - patch-package
    - pipedream-cli
    - pkg
    - playwright
    - pnpm
    - projen
    - psi
+    - quicktype
    - semantic-release
    - serve
    - serverless
+    - storybook
    - surge
    - trellis
    - ts2c
@ -1034,6 +1057,7 @@ softwareGroups:
    - bat
    - bfg
    - boringtun
+    - buildkite-agent
    - clamav
    - cloudflared
    - cmake
@ -1255,7 +1279,6 @@ softwareGroups:
  __hostname__util-tmpl: []
  __hostname__vault-tmpl:
    - onlykey
-    - yubikey
  __hostname__vpn-pritunl-tmpl: []
  __hostname__vpn-proton-tmpl:
    - protonvpn
@ -1294,6 +1317,8 @@ softwareGroups:
      note: Deprecated in favor of `delta`
    - pkg: easyengine
      note: Deprecated in favor of `wordops` which is the new and improved version of EasyEngine
+    - pkg: filezilla
+      note: FileZilla has an offensive user-interface. Absolutely atrocious.
    - pkg: gdu
      note: Deprecated in favor of `duf` which is written in Rust
    - pkg: git-fuzzy
--- a/home/.chezmoiscripts/disabled/run_onchange_after_14-warp.tmpl
+++ b/home/.chezmoiscripts/disabled/run_onchange_after_14-warp.tmpl
@ -51,7 +51,7 @@ if [[ ! "$(test -d /proc && grep Microsoft /proc/version > /dev/null)" ]] && com
    {{ if and (or (and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID"))) (env "CLOUDFLARE_TEAMS_CLIENT_ID")) (or (and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET"))) (env "CLOUDFLARE_TEAMS_CLIENT_SECRET")) -}}
    ### Enroll with CloudFlare Teams
    logg info 'Enrolling with CloudFlare Teams'
-    warp-cli teams-enroll '{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) }}{{ includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt }}{{ else }}{{ env "CLOUDFLARE_TEAMS_CLIENT_ID" }}{{ end }}' '{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) }}{{ includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_SECRET" | decrypt }}{{ else }}{{ env "CLOUDFLARE_TEAMS_CLIENT_SECRET" }}{{ end }}'
+    warp-cli teams-enroll '{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_ID")) }}{{ includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_ID" | decrypt | trim }}{{ else }}{{ env "CLOUDFLARE_TEAMS_CLIENT_ID" }}{{ end }}' '{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_TEAMS_CLIENT_SECRET")) }}{{ includeTemplate "secrets/CLOUDFLARE_TEAMS_CLIENT_SECRET" | decrypt | trim }}{{ else }}{{ env "CLOUDFLARE_TEAMS_CLIENT_SECRET" }}{{ end }}'
    {{- end }}
 fi

--- a/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.sh.tmpl
@ -23,12 +23,12 @@

 {{ $ovpnUsername := (env "OVPN_USERNAME") }}
 {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "OVPN_USERNAME")) }}
-{{   $ovpnUsername := (includeTemplate "secrets/OVPN_USERNAME" | decrypt) }}
+{{   $ovpnUsername := (includeTemplate "secrets/OVPN_USERNAME" | decrypt | trim) }}
 {{ end }}

 {{ $ovpnPassword := (env "OVPN_PASSWORD") }}
 {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "OVPN_PASSWORD")) }}
-{{   $ovpnPassword := (includeTemplate "secrets/OVPN_PASSWORD" | decrypt) }}
+{{   $ovpnPassword := (includeTemplate "secrets/OVPN_PASSWORD" | decrypt | trim) }}
 {{ end }}

 {{ includeTemplate "universal/profile" }}
--- a/home/.chezmoiscripts/universal/run_onchange_after_44-vmware-install.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_44-vmware-install.sh.tmpl
@ -38,7 +38,7 @@

 {{- $secretKey := "" -}}
 {{- if (stat (joinPath (.chezmoi.sourceDir ".chezmoitemplates" "secrets" "VMWARE_WORKSTATION_LICENSE_KEY"))) -}}
-{{-   $secretKey = (default "4C21U-2KK9Q-M8130-4V2QH-CF810" (includeTemplate "secrets/VMWARE_WORKSTATION_LICENSE_KEY" | decrypt)) -}}
+{{-   $secretKey = (default "4C21U-2KK9Q-M8130-4V2QH-CF810" (includeTemplate "secrets/VMWARE_WORKSTATION_LICENSE_KEY" | decrypt | trim)) -}}
 {{- else -}}
 {{-   $secretKey = (default "4C21U-2KK9Q-M8130-4V2QH-CF810" (env "VMWARE_WORKSTATION_LICENSE_KEY")) -}}
 {{- end }}
--- a/home/.chezmoiscripts/universal/run_onchange_after_57-netdata.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_57-netdata.sh.tmpl
@ -15,8 +15,8 @@

 ### Claim the instance with Netdata Cloud
 if command -v netdata-claim.sh > /dev/null; then
-    NETDATA_TOKEN="{{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NETDATA_TOKEN")) -}}{{- includeTemplate "secrets/NETDATA_TOKEN" | decrypt -}}{{- else -}}{{- env "NETDATA_TOKEN" -}}{{- end -}}"
-    NETDATA_ROOM="{{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NETDATA_ROOM")) -}}{{- includeTemplate "secrets/NETDATA_ROOM" | decrypt -}}{{- else -}}{{- env "NETDATA_ROOM" -}}{{- end -}}"
+    NETDATA_TOKEN="{{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NETDATA_TOKEN")) -}}{{- includeTemplate "secrets/NETDATA_TOKEN" | decrypt | trim -}}{{- else -}}{{- env "NETDATA_TOKEN" -}}{{- end -}}"
+    NETDATA_ROOM="{{- if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NETDATA_ROOM")) -}}{{- includeTemplate "secrets/NETDATA_ROOM" | decrypt | trim -}}{{- else -}}{{- env "NETDATA_ROOM" -}}{{- end -}}"
    # netdata-claim.sh must be run as netdata user
    sudo -H -u netdata bash -c 'netdata-claim.sh -token="$NETDATA_TOKEN" -rooms="$NETDATA_ROOM" -url="{{ .netdataClaimURL }}"'

--- a/home/.chezmoiscripts/universal/run_onchange_after_58-nginx-amplify.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_58-nginx-amplify.sh.tmpl
@ -21,7 +21,7 @@ if command -v nginx > /dev/null; then
    curl -sSL https://github.com/nginxinc/nginx-amplify-agent/raw/master/packages/install.sh > "$TMP"

    logg info 'Running the NGINX Amplify setup script'
-    API_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NGINX_AMPLIFY_API_KEY")) }}{{- includeTemplate "secrets/NGINX_AMPLIFY_API_KEY" | decrypt -}}{{ else }}{{- env "NGINX_AMPLIFY_API_KEY" -}}{{ end }}" sh "$TMP"
+    API_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NGINX_AMPLIFY_API_KEY")) }}{{- includeTemplate "secrets/NGINX_AMPLIFY_API_KEY" | decrypt | trim -}}{{ else }}{{- env "NGINX_AMPLIFY_API_KEY" -}}{{ end }}" sh "$TMP"
 fi

 {{ end -}}
--- a/home/.chezmoiscripts/universal/run_onchange_after_59-connect-tailscale.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_59-connect-tailscale.sh.tmpl
@ -22,7 +22,7 @@ if [ -d /Applications ] && [ -d System ]; then
 fi

 ### Connect to Tailscale network
-TAILSCALE_AUTH_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "TAILSCALE_AUTH_KEY")) }}{{ includeTemplate "secrets/TAILSCALE_AUTH_KEY" | decrypt }}{{ else }}{{ env "TAILSCALE_AUTH_KEY" }}{{ end }}"
+TAILSCALE_AUTH_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "TAILSCALE_AUTH_KEY")) }}{{ includeTemplate "secrets/TAILSCALE_AUTH_KEY" | decrypt | trim }}{{ else }}{{ env "TAILSCALE_AUTH_KEY" }}{{ end }}"
 if command -v tailscale > /dev/null && [ "$TAILSCALE_AUTH_KEY" != "" ]; then
  logg info 'Connecting to Tailscale with user-defined authentication key'
  timeout 14 tailscale up --authkey="$TAILSCALE_AUTH_KEY" --accept-routes || EXIT_CODE=$?
--- a/home/.chezmoiscripts/universal/run_onchange_after_81-k8s-digitalocean.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_81-k8s-digitalocean.sh.tmpl
@ -12,7 +12,7 @@
 {{ includeTemplate "universal/logg" }}

 ### Ensure `DIGITALOCEAN_ACCESS_TOKEN` is defined (used for headlessly connecting to the k8s cluster)
-export DIGITALOCEAN_ACCESS_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "DIGITALOCEAN_ACCESS_TOKEN")) }}{{ includeTemplate "secrets/DIGITALOCEAN_ACCESS_TOKEN" | decrypt }}{{ else }}{{ env "DIGITALOCEAN_ACCESS_TOKEN" }}{{ end }}"
+export DIGITALOCEAN_ACCESS_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "DIGITALOCEAN_ACCESS_TOKEN")) }}{{ includeTemplate "secrets/DIGITALOCEAN_ACCESS_TOKEN" | decrypt | trim }}{{ else }}{{ env "DIGITALOCEAN_ACCESS_TOKEN" }}{{ end }}"

 if [ -n "$DIGITALOCEAN_ACCESS_TOKEN" ] && [ -n '{{ .user.digitalOceanClusterId }}' ]; then
    ### Ensure DigitalOcean CLI is instaled
--- a/home/.chezmoiscripts/universal/run_onchange_before_03-jumpcloud-linux.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_before_03-jumpcloud-linux.sh.tmpl
@ -22,6 +22,6 @@
 {{ includeTemplate "universal/logg-before" }}

 logg info 'Enrolling device with JumpCloud by running the kickstart script'
-curl --tlsv1.2 --silent --show-error --header 'x-connect-key: {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "JUMPCLOUD_CONNECT_KEY")) }}{{- includeTemplate "secrets/JUMPCLOUD_CONNECT_KEY" | decrypt -}}{{ else }}{{- env "JUMPCLOUD_CONNECT_KEY" -}}{{ end }}' https://kickstart.jumpcloud.com/Kickstart | sudo bash
+curl --tlsv1.2 --silent --show-error --header 'x-connect-key: {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "JUMPCLOUD_CONNECT_KEY")) }}{{- includeTemplate "secrets/JUMPCLOUD_CONNECT_KEY" | decrypt | trim -}}{{ else }}{{- env "JUMPCLOUD_CONNECT_KEY" -}}{{ end }}' https://kickstart.jumpcloud.com/Kickstart | sudo bash

 {{ end -}}
--- a/home/.chezmoiscripts/windows/run_onchange_before_03-jumpcloud.ps1.tmpl
+++ b/home/.chezmoiscripts/windows/run_onchange_before_03-jumpcloud.ps1.tmpl
@ -1,3 +1,3 @@
 {{- if and (eq .host.distro.family "windows") (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (or (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "JUMPCLOUD_CONNECT_KEY")) (env "JUMPCLOUD_CONNECT_KEY")) -}}
-cd $env:temp | Invoke-Expression; Invoke-RestMethod -Method Get -URI https://raw.githubusercontent.com/TheJumpCloud/support/master/scripts/windows/InstallWindowsAgent.ps1 -OutFile InstallWindowsAgent.ps1 | Invoke-Expression; ./InstallWindowsAgent.ps1 -JumpCloudConnectKey "{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "JUMPCLOUD_CONNECT_KEY")) }}{{- includeTemplate "secrets/JUMPCLOUD_CONNECT_KEY" | decrypt -}}{{ else }}{{- env "JUMPCLOUD_CONNECT_KEY" -}}{{ end }}"
+cd $env:temp | Invoke-Expression; Invoke-RestMethod -Method Get -URI https://raw.githubusercontent.com/TheJumpCloud/support/master/scripts/windows/InstallWindowsAgent.ps1 -OutFile InstallWindowsAgent.ps1 | Invoke-Expression; ./InstallWindowsAgent.ps1 -JumpCloudConnectKey "{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "JUMPCLOUD_CONNECT_KEY")) }}{{- includeTemplate "secrets/JUMPCLOUD_CONNECT_KEY" | decrypt | trim -}}{{ else }}{{- env "JUMPCLOUD_CONNECT_KEY" -}}{{ end }}"
 {{ end -}}
--- a/home/.chezmoitemplates/secrets/ATUIN_EMAIL
+++ b/home/.chezmoitemplates/secrets/ATUIN_EMAIL
@ -0,0 +1,7 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjVDczdFBjV3I3U1R2c29L
+Z0g4SllHdE9hczlQTm80UmxLKzlZazIyL21VClRwdDk0aDg2bWtwbW9vdERRLzZk
+UHdjU2w0T1phdWtzZSs4NEJZUWRVRFEKLS0tIHBDcExubktwaVdyemh4Tk5MdEdC
+VHhhNW55enZEUlkzT3RtYUJ0ZGtmMkEKqi4ZU3CRVpr0NPpM4Fx65Q/7Vzefvegr
+/QN0PbUaFRPSajNEKCvkBc684nlHJTizDEhUUA==
+-----END AGE ENCRYPTED FILE-----
--- a/home/.chezmoitemplates/secrets/ATUIN_PASSWORD
+++ b/home/.chezmoitemplates/secrets/ATUIN_PASSWORD
@ -0,0 +1,7 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXSWpDcjdxMUdFaHBMeVNz
+bkU2N2NHSEc0QUhlSW9ETEhITngwTk5OWlFnCldFQlJVTU02RTFLd2h5OHVrUEE2
+L1lCenVwdmhEalJNeU5uc3RKTFZXdzQKLS0tIHZlcU5wcWlob1JmNTBSWVRsVHM2
+R09SSkNIUWoxdXdyWVplNzk3ay90N3MKpnR0SBljKaXyH8pBY/tL6qA0YjmrRekO
+sKXriTefZEFKkkr944YrYNiEtRGFrak=
+-----END AGE ENCRYPTED FILE-----
--- a/home/.chezmoitemplates/secrets/ATUIN_USERNAME
+++ b/home/.chezmoitemplates/secrets/ATUIN_USERNAME
@ -0,0 +1,7 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3WWxWT3l6YVU2TzR0dEpY
+MDlRb2RXL0ROYWRqbzRveUY2S1gxd0twSmxJCnZ4NHg1YjBZaDFyK1AxU09JUEVW
+TTVWMU5ENE5CNFA1UCtSWHhjY0RWMXMKLS0tIDJWYjd3Z2FRRFhkWS9Wam14NjVo
+YjkyRHJEYkZkcUJiZVRaSmJjazNqbTgKLAqHltITr8Y/14Pya6azYe9ANeaT84mZ
+SjpGKDYyGOBwxdpeJhoEu5q0Hqo2mP4HM6M=
+-----END AGE ENCRYPTED FILE-----
--- a/home/dot_config/ghorg/conf.yaml.tmpl
+++ b/home/dot_config/ghorg/conf.yaml.tmpl
@ -149,7 +149,7 @@ GHORG_EXIT_CODE_ON_CLONE_ISSUES: 1

 # Add your GitHub token
 # flag (--token, -t) eg: --token=bGVhdmUgYSBjb21tZW50IG9uIGlzc3VlIDY2
-GHORG_GITHUB_TOKEN: {{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITHUB_READ_TOKEN")) }}{{ includeTemplate "secrets/GITHUB_READ_TOKEN" | decrypt }}{{ else }}{{ env "GITHUB_READ_TOKEN" }}{{ end }}
+GHORG_GITHUB_TOKEN: {{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITHUB_READ_TOKEN")) }}{{ includeTemplate "secrets/GITHUB_READ_TOKEN" | decrypt | trim }}{{ else }}{{ env "GITHUB_READ_TOKEN" }}{{ end }}

 # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 # |G|I|T|L|A|B| |S|P|E|C|I|F|I|C|
@ -157,7 +157,7 @@ GHORG_GITHUB_TOKEN: {{ if and (stat (joinPath .host.home ".config" "age" "chezmo

 # Add your GitLab token
 # flag (--token, -t) eg: --token=bGVhdmUgYSBjb21tZW50IG9uIGlzc3VlIDY2
-GHORG_GITLAB_TOKEN: {{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITLAB_READ_TOKEN")) }}{{ includeTemplate "secrets/GITLAB_READ_TOKEN" | decrypt }}{{ else }}{{ env "GITLAB_READ_TOKEN" }}{{ end }}
+GHORG_GITLAB_TOKEN: {{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITLAB_READ_TOKEN")) }}{{ includeTemplate "secrets/GITLAB_READ_TOKEN" | decrypt | trim }}{{ else }}{{ env "GITLAB_READ_TOKEN" }}{{ end }}

 # clones repos in a directory structure that matches gitlab namespaces eg company/unit/subunit/app would clone into ghorg/org/unit/subunit/app
 # flag (--preserve-dir)
--- a/home/dot_config/git/config.tmpl
+++ b/home/dot_config/git/config.tmpl
@ -154,7 +154,7 @@
  smtpuser = {{ default "" .user.gmail.username }}
  smtpencryption = tls
  smtpserverport = 587
-  smtpPass = {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GMAIL_PASSWORD")) }}{{ includeTemplate "secrets/GMAIL_PASSWORD" | decrypt }}{{ else }}{{ default "" (env "GMAIL_PASSWORD") }}{{ end }}
+  smtpPass = {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GMAIL_PASSWORD")) }}{{ includeTemplate "secrets/GMAIL_PASSWORD" | decrypt | trim }}{{ else }}{{ default "" (env "GMAIL_PASSWORD") }}{{ end }}
 [status]
  showUntrackedFiles = all
  submoduleSummary = true
--- a/home/dot_config/ngrok/ngrok.yml.tmpl
+++ b/home/dot_config/ngrok/ngrok.yml.tmpl
@ -1,4 +1,4 @@
 {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (or (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NGROK_AUTH_TOKEN")) (env "NGROK_AUTH_TOKEN")) -}}
 version: "2"
-authtoken: '{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NGROK_AUTH_TOKEN")) }}{{- includeTemplate "secrets/NGROK_AUTH_TOKEN" | decrypt -}}{{ else }}{{- env "NGROK_AUTH_TOKEN" -}}{{ end }}'
+authtoken: '{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NGROK_AUTH_TOKEN")) }}{{- includeTemplate "secrets/NGROK_AUTH_TOKEN" | decrypt | trim -}}{{ else }}{{- env "NGROK_AUTH_TOKEN" -}}{{ end }}'
 {{- end -}}
--- a/home/dot_config/npm/npmrc.tmpl
+++ b/home/dot_config/npm/npmrc.tmpl
@ -9,4 +9,4 @@ loglevel=error
 network-concurrency=32
 prefix={{ .chezmoi.homeDir }}/.local/share/npm
 strict-peer-dependencies=false
-//registry.npmjs.org/:_authToken={{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NPM_TOKEN")) }}{{- includeTemplate "secrets/NPM_TOKEN" | decrypt -}}{{ else if (env "NPM_TOKEN") }}{{- env "NPM_TOKEN" -}}{{ else }}${NPM_TOKEN}{{ end }}
+//registry.npmjs.org/:_authToken={{ if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NPM_TOKEN")) }}{{- includeTemplate "secrets/NPM_TOKEN" | decrypt | trim -}}{{ else if (env "NPM_TOKEN") }}{{- env "NPM_TOKEN" -}}{{ else }}${NPM_TOKEN}{{ end }}
--- a/home/dot_config/postfix/private_sasl_passwd.tmpl
+++ b/home/dot_config/postfix/private_sasl_passwd.tmpl
@ -1,3 +1,3 @@
 {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (or (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SENDGRID_API_KEY")) (env "SENDGRID_API_KEY")) -}}
-[smtp.sendgrid.net]:587 apikey:{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SENDGRID_API_KEY")) }}{{ includeTemplate "secrets/SENDGRID_API_KEY" | decrypt }}{{ else }}{{ env "SENDGRID_API_KEY" }}{{ end }}
+[smtp.sendgrid.net]:587 apikey:{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SENDGRID_API_KEY")) }}{{ includeTemplate "secrets/SENDGRID_API_KEY" | decrypt | trim }}{{ else }}{{ env "SENDGRID_API_KEY" }}{{ end }}
 {{- end -}}
--- a/home/dot_config/powershell/profile.ps1
+++ b/home/dot_config/powershell/profile.ps1
@ -1,18 +1,12 @@
+# [PSFzf](https://github.com/kelleyma49/PSFzf)
+# [DockerCompletion](https://github.com/matt9ucci/DockerCompletion)
+
 ### Env
 $env:EDITOR = 'code --wait'
 $env:GIT_SSH = "C:\Windows\system32\OpenSSH\ssh.exe"

 ### Set PowerShell to UTF-8
-[console]::InputEncoding = [console]::OutputEncoding = New-Object System.Text.UTF8Encoding
-
-### Oh My Posh
-Install-Module posh-git
-oh-my-posh init pwsh --config "$env:HOME/.config/oh-my-posh/Betelgeuse.omp.json" | Invoke-Expression
-
-### Docker Completion
-Import-Module "$env:HOME/.local/share/powershell/docker/DockerCompletion/DockerCompletion"
-
-# Import-Module -Name Terminal-Icons
+[Console]::InputEncoding = [Console]::OutputEncoding = [System.Text.UTF8Encoding]::new()

 ### PSReadLine
 Set-PSReadLineOption -EditMode Vi
@ -20,23 +14,38 @@ Set-PSReadLineOption -BellStyle None
 Set-PSReadLineKeyHandler -Chord 'Ctrl+d' -Function DeleteChar
 Set-PSReadLineOption -PredictionSource History

-### Fzf
-# Note: This was not working under PowerShell via VSCode on macOS
-# The specified module 'PSFzf' was not loaded because no valid module file was found in any module directory.
-# Import-Module PSFzf
-# Set-PsFzfOption -PSReadlineChordProvider 'Ctrl+t' -PSReadlineChordReverseHistory 'Ctrl+r'
+### Import PowerShell modules
+$modules = @("Carbon", "ImportExcel", "Microsoft.PowerShell.ConsoleGuiTools", "Microsoft.PowerShell.PSResourceGet", "PSFzf", "PSWindowsUpdate", "PackageManagement", "PendingReboot", "posh-git", "Terminal-Icons")
+
+foreach ($module in $modules) {
+    if (-not (Get-Module -ListAvailable -Name $module)) {
+        Install-Module -Name $module -Scope CurrentUser -Force -Repository PSGallery -AllowPrerelease
+    }
+    Import-Module $module -Force
+}
+
+### posh-git settings
+oh-my-posh init pwsh --config "$env:HOME/.config/oh-my-posh/Betelgeuse.omp.json" | Invoke-Expression
+
+### PSFzf settings
+Set-PsFzfOption -PSReadlineChordProvider 'Ctrl+t' -PSReadlineChordReverseHistory 'Ctrl+r'
+$commandOverride = [ScriptBlock]::Create("param(\$Location) Set-Location \$Location")
+Set-PsFzfOption -AltCCommand $commandOverride
+Set-PsFzfOption -TabExpansion
+$env:_PSFZF_FZF_DEFAULT_OPTS = "--ansi --preview 'bat --color=always {}'"
+Set-PSFzfOption -EnableAlias

 ### zoxide
-Invoke-Expression (& {
-  $hook = if ($PSVersionTable.PSVersion.Major -lt 6) { 'prompt' } else { 'pwd' }
+Invoke-Expression '& {
+  $hook = if ($PSVersionTable.PSVersion.Major -lt 6) { "prompt" } else { "pwd" }
  (zoxide init --hook $hook powershell | Out-String)
-})
+}'

 ### Aliases
-Set-Alias grep findstr
+Set-Alias grep Select-String

 ### Utilities
 function which ($command) {
  Get-Command -Name $command -ErrorAction SilentlyContinue |
-    Select-Object -ExpandProperty Path -ErrorAction SilentlyContinue
+    Select-Object -ExpandProperty Source -ErrorAction SilentlyContinue
 }
--- a/home/dot_config/rclone/merge_private_rclone.conf.tmpl
+++ b/home/dot_config/rclone/merge_private_rclone.conf.tmpl
@ -16,12 +16,12 @@ fi
 tee -a "$CONFIG_FILE" > /dev/null <<EOT
 # MEGABYTE LABS MANAGED S3
 [{{ .user.username}}-s3]
-access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
+access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
 acl = private
 endpoint = {{ .user.cloudflare.r2 }}.r2.cloudflarestorage.com/user
 provider = Cloudflare
 region = auto
-secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
+secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
 type = s3
 # MEGABYTE LABS MANAGED S3
 EOT
--- a/home/dot_config/rclone/private_system-rclone.conf.tmpl
+++ b/home/dot_config/rclone/private_system-rclone.conf.tmpl
@ -1,37 +1,37 @@
 {{- if and (or (and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID"))) (env "CLOUDFLARE_R2_ID")) (or (and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET"))) (env "CLOUDFLARE_R2_SECRET")) (ne .user.cloudflare.r2 "") -}}
 [docker]
-access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
+access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
 acl = private
 endpoint = {{ .user.cloudflare.r2 }}.r2.cloudflarestorage.com/docker
 env_auth = false
 provider = Cloudflare
-secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
+secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
 type = s3

 [private]
-access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
+access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
 acl = private
 endpoint = {{ .user.cloudflare.r2 }}.r2.cloudflarestorage.com/private
 env_auth = false
 provider = Cloudflare
-secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
+secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
 type = s3

 [public]
-access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
+access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
 acl = public-read
 endpoint = {{ .user.cloudflare.r2 }}.r2.cloudflarestorage.com/public
 env_auth = false
 provider = Cloudflare
-secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
+secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
 type = s3

 [system]
-access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
+access_key_id = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_ID")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_ID" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_ID" -}}{{ end }}
 acl = private
 endpoint = {{ .user.cloudflare.r2 }}.r2.cloudflarestorage.com/system
 env_auth = false
 provider = Cloudflare
-secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
+secret_access_key = {{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "CLOUDFLARE_R2_SECRET")) }}{{- includeTemplate "secrets/CLOUDFLARE_R2_SECRET" | decrypt | trim -}}{{ else }}{{- env "CLOUDFLARE_R2_SECRET" -}}{{ end }}
 type = s3
 {{ end -}}
--- a/home/dot_config/shell/private_private.sh.tmpl
+++ b/home/dot_config/shell/private_private.sh.tmpl
@ -7,10 +7,15 @@
 #     that are populated by Install Doctor during the provisioning process (if they are provided).

 ### Ansible
-export ANSIBLE_GALAXY_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ANSIBLE_GALAXY_TOKEN")) }}{{ includeTemplate "secrets/ANSIBLE_GALAXY_TOKEN" | decrypt | nospace }}{{ else }}{{ env "ANSIBLE_GALAXY_TOKEN" }}{{ end }}"
+export ANSIBLE_GALAXY_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ANSIBLE_GALAXY_TOKEN")) }}{{ includeTemplate "secrets/ANSIBLE_GALAXY_TOKEN" | decrypt | trim }}{{ else }}{{ env "ANSIBLE_GALAXY_TOKEN" }}{{ end }}"
 export ANSIBLE_VAULT_PASSWORD="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ANSIBLE_VAULT_PASSWORD")) }}{{ includeTemplate "secrets/ANSIBLE_VAULT_PASSWORD" | decrypt | trim }}{{ else }}{{ env "ANSIBLE_VAULT_PASSWORD" }}{{ end }}"
 export AVP="$ANSIBLE_VAULT_PASSWORD"

+### Atuin
+export ATUIN_EMAIL="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ATUIN_EMAIL")) }}{{ includeTemplate "secrets/ATUIN_EMAIL" | decrypt | trim }}{{ else }}{{ env "ATUIN_EMAIL" }}{{ end }}"
+export ATUIN_PASSWORD="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ATUIN_PASSWORD")) }}{{ includeTemplate "secrets/ATUIN_PASSWORD" | decrypt | trim }}{{ else }}{{ env "ATUIN_PASSWORD" }}{{ end }}"
+export ATUIN_USERNAME="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "ATUIN_USERNAME")) }}{{ includeTemplate "secrets/ATUIN_USERNAME" | decrypt | trim }}{{ else }}{{ env "ATUIN_USERNAME" }}{{ end }}"
+
 ### Google Cloud SDK
 export CLOUDSDK_CORE_PROJECT="{{ .user.gcloud.coreProject }}"
 export GCE_SERVICE_ACCOUNT_EMAIL="{{ .user.gcloud.email }}"
@ -21,19 +26,19 @@ export LEXICON_CLOUDFLARE_TOKEN=""
 export LEXICON_CLOUDFLARE_USERNAME="{{ .user.cloudflare.username }}"

 ### DockerHub
-export DOCKERHUB_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "DOCKERHUB_TOKEN")) }}{{ includeTemplate "secrets/DOCKERHUB_TOKEN" | decrypt }}{{ else }}{{ env "DOCKERHUB_TOKEN" }}{{ end }}"
+export DOCKERHUB_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "DOCKERHUB_TOKEN")) }}{{ includeTemplate "secrets/DOCKERHUB_TOKEN" | decrypt | trim }}{{ else }}{{ env "DOCKERHUB_TOKEN" }}{{ end }}"
 export DOCKERHUB_REGISTRY_PASSWORD="$DOCKERHUB_TOKEN"

 ### GitHub
-export GH_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITHUB_TOKEN")) }}{{ includeTemplate "secrets/GITHUB_TOKEN" | decrypt }}{{ else }}{{ env "GITHUB_TOKEN" }}{{ end }}"
+export GH_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITHUB_TOKEN")) }}{{ includeTemplate "secrets/GITHUB_TOKEN" | decrypt | trim }}{{ else }}{{ env "GITHUB_TOKEN" }}{{ end }}"
 export GITHUB_TOKEN="$GH_TOKEN"

 ### GitLab
-export GL_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITLAB_TOKEN")) }}{{ includeTemplate "secrets/GITLAB_TOKEN" | decrypt }}{{ else }}{{ env "GITLAB_TOKEN" }}{{ end }}"
+export GL_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "GITLAB_TOKEN")) }}{{ includeTemplate "secrets/GITLAB_TOKEN" | decrypt | trim }}{{ else }}{{ env "GITLAB_TOKEN" }}{{ end }}"
 export GITLAB_TOKEN="$GL_TOKEN"

 ### Heroku
-export HEROKU_API_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "HEROKU_API_KEY")) }}{{ includeTemplate "secrets/HEROKU_API_KEY" | decrypt }}{{ else }}{{ env "HEROKU_API_KEY" }}{{ end }}"
+export HEROKU_API_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "HEROKU_API_KEY")) }}{{ includeTemplate "secrets/HEROKU_API_KEY" | decrypt | trim }}{{ else }}{{ env "HEROKU_API_KEY" }}{{ end }}"

 ### Install Doctor
 export HEADLESS_INSTALL=true
@ -54,29 +59,29 @@ fi
 export FULLY_AUTOMATED_TASKS=true

 ### NPM
-export NPM_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NPM_TOKEN")) }}{{ includeTemplate "secrets/NPM_TOKEN" | decrypt }}{{ else }}{{ env "NPM_TOKEN" }}{{ end }}"
+export NPM_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "NPM_TOKEN")) }}{{ includeTemplate "secrets/NPM_TOKEN" | decrypt | trim }}{{ else }}{{ env "NPM_TOKEN" }}{{ end }}"

 ### OpenAI
-export OPENAI_API_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "OPENAI_API_KEY")) }}{{ includeTemplate "secrets/OPENAI_API_KEY" | decrypt }}{{ else }}{{ env "OPENAI_API_KEY" }}{{ end }}"
+export OPENAI_API_KEY="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "OPENAI_API_KEY")) }}{{ includeTemplate "secrets/OPENAI_API_KEY" | decrypt | trim }}{{ else }}{{ env "OPENAI_API_KEY" }}{{ end }}"

 ### PyPi
-export PYPI_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "PYPI_TOKEN")) }}{{ includeTemplate "secrets/PYPI_TOKEN" | decrypt }}{{ else }}{{ env "PYPI_TOKEN" }}{{ end }}"
+export PYPI_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "PYPI_TOKEN")) }}{{ includeTemplate "secrets/PYPI_TOKEN" | decrypt | trim }}{{ else }}{{ env "PYPI_TOKEN" }}{{ end }}"

 ### Snapcraft
 export SNAPCRAFT_EMAIL="{{ .user.snapcraft.username }}"
-export SNAPCRAFT_MACAROON="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SNAPCRAFT_MACAROON")) }}{{ includeTemplate "secrets/SNAPCRAFT_MACAROON" | decrypt }}{{ else }}{{ env "SNAPCRAFT_MACAROON" }}{{ end }}"
-export SNAPCRAFT_UNBOUND_DISCHARGE="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SNAPCRAFT_UNBOUND_DISCHARGE")) }}{{ includeTemplate "secrets/SNAPCRAFT_UNBOUND_DISCHARGE" | decrypt }}{{ else }}{{ env "SNAPCRAFT_UNBOUND_DISCHARGE" }}{{ end }}"
+export SNAPCRAFT_MACAROON="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SNAPCRAFT_MACAROON")) }}{{ includeTemplate "secrets/SNAPCRAFT_MACAROON" | decrypt | trim }}{{ else }}{{ env "SNAPCRAFT_MACAROON" }}{{ end }}"
+export SNAPCRAFT_UNBOUND_DISCHARGE="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SNAPCRAFT_UNBOUND_DISCHARGE")) }}{{ includeTemplate "secrets/SNAPCRAFT_UNBOUND_DISCHARGE" | decrypt | trim }}{{ else }}{{ env "SNAPCRAFT_UNBOUND_DISCHARGE" }}{{ end }}"

 ### Surge.sh
-export SURGE_LOGIN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SURGE_LOGIN")) }}{{ includeTemplate "secrets/SURGE_LOGIN" | decrypt }}{{ else }}{{ env "SURGE_LOGIN" }}{{ end }}"
-export SURGE_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SURGE_TOKEN")) }}{{ includeTemplate "secrets/SURGE_TOKEN" | decrypt }}{{ else }}{{ env "SURGE_TOKEN" }}{{ end }}"
+export SURGE_LOGIN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SURGE_LOGIN")) }}{{ includeTemplate "secrets/SURGE_LOGIN" | decrypt | trim }}{{ else }}{{ env "SURGE_LOGIN" }}{{ end }}"
+export SURGE_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "SURGE_TOKEN")) }}{{ includeTemplate "secrets/SURGE_TOKEN" | decrypt | trim }}{{ else }}{{ env "SURGE_TOKEN" }}{{ end }}"

 ### Vagrant Cloud
-export VAGRANT_CLOUD_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "VAGRANT_CLOUD_TOKEN")) }}{{ includeTemplate "secrets/VAGRANT_CLOUD_TOKEN" | decrypt }}{{ else }}{{ env "VAGRANT_CLOUD_TOKEN" }}{{ end }}"
+export VAGRANT_CLOUD_TOKEN="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "VAGRANT_CLOUD_TOKEN")) }}{{ includeTemplate "secrets/VAGRANT_CLOUD_TOKEN" | decrypt | trim }}{{ else }}{{ env "VAGRANT_CLOUD_TOKEN" }}{{ end }}"

 ### Xcodes
 # Apple ID username and password
-export XCODES_USERNAME="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "APPLE_USERNAME")) }}{{ includeTemplate "secrets/APPLE_USERNAME" | decrypt }}{{ else }}{{ env "APPLE_USERNAME" }}{{ end }}"
-export XCODES_PASSWORD="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "APPLE_PASSWORD")) }}{{ includeTemplate "secrets/APPLE_PASSWORD" | decrypt }}{{ else }}{{ env "APPLE_PASSWORD" }}{{ end }}"
+export XCODES_USERNAME="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "APPLE_USERNAME")) }}{{ includeTemplate "secrets/APPLE_USERNAME" | decrypt | trim }}{{ else }}{{ env "APPLE_USERNAME" }}{{ end }}"
+export XCODES_PASSWORD="{{ if (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "APPLE_PASSWORD")) }}{{ includeTemplate "secrets/APPLE_PASSWORD" | decrypt | trim }}{{ else }}{{ env "APPLE_PASSWORD" }}{{ end }}"

 {{ end -}}
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@ -359,7 +359,7 @@ if command -v antigen > /dev/null; then
  antigen bundle yarn

  if [ ! -d /Applications ]; then
-    # Plugins that are troublesome on macOS
+    # Plugins that are troublesome on macOS due to Docker Desktop needing to launch
    antigen bundle docker
    antigen bundle docker-compose
  fi
--- a/software.yml
+++ b/software.yml
@ -349,6 +349,17 @@ softwarePackages:
    _home: https://pieces.app/
    _name: Pieces CLI
    cask: pieces-cli
+  buildkite-agent:
+    _bin: buildkite-agent
+    _github: https://github.com/buildkite/agent
+    _name: BuildKite Agent
+    brew: buildkite/buildkite/buildkite-agent
+  multi-gitter:
+    _bin: multi-gitter
+    _github: https://github.com/lindell/multi-gitter
+    _name: Multi-Gitter
+    brew: lindell/multi-gitter/multi-gitter
+    go: github.com/lindell/multi-gitter@latest
  allure:
    _bin: allure
    _desc: '[Allure Report](https://docs.qameta.io/allure-testops/) is a flexible, lightweight multi-language test reporting tool. It provides clear graphical reports and allows everyone involved in the development process to extract the maximum of information from the everyday testing process.'
@ -701,11 +712,17 @@ softwarePackages:
    _home: https://astronvim.github.io/
    _name: AstroNvim
    _post: nvim --headless -c 'autocmd User PackerComplete quitall'
+  devtoys:
+    _bin: devtoys
+    _github: https://github.com/ObuchiYuki/DevToysMac
+    _when:cask: echo '! test -d /Applications/DevToys.app' | bash
+    cask: devtoys
  devbox:
    _bin: devbox
    _github: https://github.com/jetpack-io/devbox
-    nix-env: nixpkgs.devbox
-    script: curl -fsSL https://get.jetpack.io/devbox | bash
+    _todo: Revisit because install via script would require expect since piping y to the installer is not working
+    # nix-env: nixpkgs.devbox
+    # script: curl -fsSL https://get.jetpack.io/devbox | bash
  codeedit:
    _bin: codeedit
    _github: https://github.com/CodeEditApp/CodeEdit
@ -1074,6 +1091,29 @@ softwarePackages:
    _home: https://github.com/dim-an/cod
    _name: Cod
    go: github.com/dim-an/cod@master
+  utm:
+    _bin: utm
+    _github: https://github.com/utmapp/UTM
+    _name: UTM
+    cask: utm
+  amethyst:
+    _bin: amethyst
+    _github: https://github.com/ianyh/Amethyst
+    _name: Amethyst
+    _when:cask: echo '! test -d /Applications/Amethyst.app' | bash
+    cask: amethyst
+  alt-tab:
+    _bin: alt-tab
+    _github: https://github.com/lwouis/alt-tab-macos
+    _name: Alt+Tab for macOS that works like alt+tab on Windows
+    _when:cask: echo '! test -d /Applications/AltTab.app' | bash
+    cask: alt-tab
+  fiscript:
+    _bin: fiscript
+    _github: https://github.com/Mortennn/FiScript
+    _name: FiScript
+    _when:cask: echo '! test -d /Applications/FiScript.app' | bash
+    cask: fiscript
  opencommit:
    _bin: opencommit
    _desc: GPT CLI to auto-generate impressive commits in 1 second
@ -1179,6 +1219,26 @@ softwarePackages:
    _home: null
    _name: null
    npm: caniuse-cmd
+  storybook:
+    _bin: storybook
+    _github: https://github.com/storybookjs/storybook
+    _name: Storybook
+    npm: storybook
+  k9s:
+    _bin: k9s
+    _github: https://github.com/derailed/k9s
+    _name: K9s
+    brew: derailed/k9s/k9s
+    choco: k9s
+    pacman: k9s
+    port: k9s
+    scoop: k9s
+  aicommits:
+    _bin: aicommits
+    _github: https://github.com/Nutlope/aicommits
+    _name: AI Commits
+    brew: aicommits
+    npm: aicommits
  captain:
    _bin: captain
    _desc: Helps manage docker-compose.yml files from anywhere in the file system
@ -1186,7 +1246,13 @@ softwarePackages:
    _github: https://github.com/jenssegers/captain
    _home: null
    _name: captain
-    github: github.com/jenssegers/captain
+    go: github.com/jenssegers/captain@latest
+  lightproxy:
+    _bin: lightproxy
+    _github: https://github.com/alibaba/lightproxy
+    _name: LightProxy
+    _when:cask: echo '! test -d /Applications/LightProxy.app' | bash
+    cask: lightproxy
  carbon-now:
    _bin: carbon-now
    _desc: '[Carbon](https://carbon.now.sh/) lets you create and share beautiful images of your source code'
@ -4090,6 +4156,11 @@ softwarePackages:
    _when:cask: '! test -d /Applications/iTerm.app'
    ansible:darwin: professormanhattan.iterm2
    cask: iterm2
+  nativescript:
+    _bin: ns
+    _github: https://github.com/NativeScript/NativeScript
+    _name: NativeScript
+    npm: nativescript
  kube-shell:
    _bin: kube-shell
    _desc: An integrated shell for working with the Kubernetes
@ -4148,6 +4219,16 @@ softwarePackages:
    _home: https://www.jenv.be/
    _name: jenv
    ansible: professormanhattan.jenv
+  atuin:
+    _bin: atuin
+    _github: https://github.com/ellie/atuin
+    _name: Atuin
+    _post: source "$XDG_CONFIG_HOME/shell/private.sh" && atuin register -u "$ATUIN_USERNAME" -e "$ATUIN_EMAIL" -p "$ATUIN_PASSWORD" && atuin import auto && atuin sync
+    brew: atuin
+    cargo: atuin
+    pacman: atuin
+    port: atuin
+    pkg-termux: atuin
  jiq:
    _bin: jiq
    _desc: Create jq queries interactively by leveraging a live reload feature in the terminal
@ -5405,6 +5486,11 @@ softwarePackages:
      - neovim
      - python-neovim
      - python3-neovim
+  majestic:
+    _bin: majestic
+    _github: https://github.com/Raathigesh/majestic
+    _name: Majestic
+    npm: majestic
  nest:
    _bin: nest
    _desc: CLI tool for Nest applications
@ -7506,6 +7592,17 @@ softwarePackages:
    apt: endlessh
    dnf:fedora: endlessh
    yay: endlessh-git
+  kap:
+    _bin: kap
+    _github: https://github.com/wulkano/Kap
+    _name: Kap
+    _when:cask: echo '! test -d /Applications/Kap.app' | bash
+    cask: kap
+  autodoc:
+    _bin: doc
+    _github: https://github.com/context-labs/autodoc
+    _name: Autodoc
+    npm: '@context-labs/autodoc'
  ssl-proxy:
    _bin: ssl-proxy
    _desc: Simple zero-config SSL reverse proxy with real autogenerated certificates
@ -7518,6 +7615,36 @@ softwarePackages:
  # starred:
  #   _bin: starred
  #   pipx: starred
+  npkill:
+    _bin: npkill
+    _github: https://github.com/voidcosmos/npkill
+    _name: npkill
+    npm: npkill
+  npm-check-updates:
+    _bin: ncu
+    _github: https://github.com/raineorshine/npm-check-updates
+    _name: NPM Check Updates
+    npm: npm-check-updates
+  patch-package:
+    _bin: patch-package
+    _github: https://github.com/ds300/patch-package
+    _name: Patch Package
+    npm: patch-package
+  psscriptanalyzer:
+    _bin: psscriptanalyzer
+    _github: https://github.com/PowerShell/PSScriptAnalyzer
+    _name: PSScriptAnalyzer
+    choco: psscriptanalyzer
+  networkmanager:
+    _bin: networkmanager
+    _github: https://github.com/BornToBeRoot/NETworkManager
+    _name: NETworkManager
+    scoop: networkmanager
+    winget: BornToBeRoot.NETworkManager
+  gdbgui:
+    _bin: gdbgui
+    _github: https://github.com/cs01/gdbgui
+    pipx: gdbgui
  starship:
    _bin: null
    _desc: '[Starship](https://starship.rs/) is the minimal, blazing fast, and extremely customizable prompt for any shell! It shows the information you need, while staying sleek and minimal. Unlike most other prompts, it is compatible with nearly every type of terminal. If you want to retain the same look and feel across different terminals, then look no further.'
@ -8929,13 +9056,19 @@ softwarePackages:
    ansible:darwin: professormanhattan.wpcli
    ansible:linux: professormanhattan.wpcli
    brew: wp-cli
+  adobe-creative-cloud:
+    _bin: adobe-creative-cloud
+    _name: Adobe Creative Cloud
+    _when:cask: '! test -d /Applications/'
+    cask: adobe-creative-cloud
  wrangler:
    _bin: wrangler
    _desc: wrangler is a CLI tool designed for folks who are interested in using Cloudflare Workers. Deploy serverless code instantly across the globe to give it exceptional performance, reliability, and scale.
-    _docs: null
+    _docs: https://developers.cloudflare.com/workers/
    _github: https://github.com/cloudflare/wrangler
    _home: https://workers.cloudflare.com/
    _name: wrangler
+    brew: cloudflare-wrangler2
    npm: '@cloudflare/wrangler'
  wrk:
    _bin: wrk
@ -8999,6 +9132,21 @@ softwarePackages:
    port: sshfs
    scoop: sshfs-np
    brew:linux: sshfs
+  dockfmt:
+    _bin: dockfmt
+    _github: https://github.com/jessfraz/dockfmt
+    _name: dockfmt
+    go: github.com/jessfraz/dockfmt@latest
+  capacitor:
+    _bin: cap
+    _github: https://github.com/ionic-team/capacitor
+    _name: Capacitor
+    npm: '@capacitor/cli'
+  quicktype:
+    _bin: quicktype
+    _github: https://github.com/quicktype/quicktype
+    _name: Quicktype
+    npm: quicktype
  yank:
    _bin: yank
    _bin:apt: yank-cli
@ -9100,14 +9248,6 @@ softwarePackages:
    github: github.com/stedolan/jq
    go: github.com/mikefarah/yq/v4@latest
    snap: yq
-  yubikey:
-    _bin: null
-    _desc: Installs Yubico Authenticator and YubiKey Manager
-    _docs: null
-    _github: null
-    _home: null
-    _name: yubikey
-    ansible: professormanhattan.yubikey
  yubikey-authenticator:
    _bin: yubioath
    _desc: null
@ -9115,10 +9255,10 @@ softwarePackages:
    _github: null
    _home: https://www.yubico.com/products/yubico-authenticator/
    _name: Yubico Authenticator
-    _when:darwin: test -d "/Applications/Yubico Authenticator.app"
-    ansible:darwin: professormanhattan.yubikey
+    _when:script:darwin: test -d "/Applications/Yubico Authenticator.app"
    choco: yubico-authenticator
    flatpak: com.yubico.yubioath
+    script:darwin: curl -sSL https://developers.yubico.com/yubioath-flutter/Releases/yubico-authenticator-latest-mac.dmg > "/tmp/Yubico Authenticator.dmg" && hdiutil attach "/tmp/Yubico Authenticator.dmg" &&  sudo cp -R "/Volumes/Yubico Authenticator/Yubico Authenticator.app" /Applications && sudo hdiutil detach "/Volumes/Yubico Authenticator" && rm -f "/tmp/Yubico Authenticator.dmg"
  yubikey-manager:
    _bin: ykman
    _desc: Use the YubiKey Manager to configure FIDO2, OTP and PIV functionality on your YubiKey on Windows, macOS, and Linux operating systems.
@ -9131,15 +9271,15 @@ softwarePackages:
    pacman: yubikey-manager
    pipx: yubikey-manager
  yubikey-manager-qt:
-    _bin: null
+    _bin: yubikey-manager-qt
    _desc: Cross-platform application for configuring any YubiKey over all USB interfaces.
    _docs: null
    _github: https://github.com/Yubico/yubikey-manager-qt
    _home: https://developers.yubico.com/yubikey-manager-qt/
    _name: YubiKey Manager
-    _when:darwin: test -d "/Applications/YubiKey Manager.app"
-    ansible:darwin: professormanhattan.yubikey
+    _when:cask: echo '! test -d "/Applications/YubiKey Manager.app"' | bash
    appimage: Yubico/yubikey-manager-qt
+    cask: yubico-yubikey-manager
    choco: yubikey-manager
    dnf:fedora: yubikey-manager-qt
    pacman: yubikey-manager-qt
@ -9204,6 +9344,10 @@ softwarePackages:
    _bin: flatseal
    flatpak: com.github.tchx84.Flatseal
 softwarePlugins:
+  composer:
+    cmd: null
+    plugins:
+      - deployer/deployer
  docker:
    cmd: bash -c 'docker extension install {PLUGIN}'
    plugins:
@ -9272,6 +9416,7 @@ softwarePlugins:
      - vagrant-bindfs
      - vagrant-digitalocean
      - vagrant-google
+      - vagrant-hostmanager
      - vagrant-libvirt
      - vagrant-parallels
      - vagrant-share