diff --git a/docs/TODO.md b/docs/TODO.md
index 9011470f..278befe6 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -5,6 +5,10 @@ https://github.com/QaidVoid/Complete-Single-GPU-Passthrough
 https://github.com/dosyago/DiskerNet
 https://github.com/mldangelo/personal-site
 https://github.com/rigoneri/Syte3
+
+## macOS TODOs
+https://github.com/Hammerspoon/hammerspoon
+
 # Tiltfile
 ✖ ERROR Gsettings Failed to apply gsetting
 Error: Command failed: gsettings set org.gnome.desktop.interface color-scheme prefer-dark
diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 1078f214..b221e743 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -390,6 +390,7 @@ softwareGroups:
     - pup
     - ramda
     - schema
+    - textql
     - xurls
     - yj
     - yq
@@ -409,6 +410,8 @@ softwareGroups:
     - redis-desktop-manager
     - visual-studio
     - xcode
+    - xcodes
+    - xcodes-app
   Docker: &Docker
     - bane
     - clair
@@ -584,6 +587,7 @@ softwareGroups:
   Misc-Desktop: &Misc-Desktop
     - _misc-flatpaks
     - _nautilus-extensions
+    - cakebrew
     - clocker
     - cumulus
     - drawio
@@ -592,6 +596,7 @@ softwareGroups:
     - gnome-tweaks
     - mark-text
     - pake
+    - pock
     - pretzel
     - qlplugins
     - remote-desktop
@@ -627,6 +632,7 @@ softwareGroups:
     - rust
     - snapcraft
     - solidity
+    - swimat
     - upx
     - windows-adk
     - windows-admin-center
diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl
index 40755a77..25acdb04 100644
--- a/home/dot_config/shell/exports.sh.tmpl
+++ b/home/dot_config/shell/exports.sh.tmpl
@@ -322,6 +322,11 @@ export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
 ### Whalebrew
 export WHALEBREW_CONFIG_DIR="$XDG_CONFIG_HOME/whalebrew"
 
+### Xcodes
+# Apple ID username and password
+# export XCODES_USERNAME=""
+# export XCODES_PASSWORD=""
+
 ### CloudFlare Wrangler
 export WRANGLER_INSTALL_PATH="$XDG_DATA_HOME/wrangler"
 export WRANGLER_HOME="$XDG_DATA_HOME/wrangler"
diff --git a/software.yml b/software.yml
index 0cab4c3d..402999de 100644
--- a/software.yml
+++ b/software.yml
@@ -894,6 +894,34 @@ softwarePackages:
     _name: bitly
     npm: bitly-cli-client
     _type: cli
+  swimat:
+    _bin: null
+    _desc: Swift code auto-formatter for Xcode
+    _docs: https://jintin.github.io/Swimat/
+    _github: https://github.com/Jintin/Swimat
+    _home: https://jintin.github.io/Swimat/
+    _name: Swimat
+    _when:cask: '! test -d /Applications/Swimat.app'
+    cask: swimat
+  textql:
+    _bin: textql
+    _desc: CLI that allows you to execute SQL against structured text like CSV or TSV
+    _docs: https://github.com/dinedal/textql
+    _github: https://github.com/dinedal/textql
+    _home: https://github.com/dinedal/textql
+    _name: TextQL
+    brew: textql
+    go: github.com/dinedal/textql@master
+    yay: textql-git
+  cakebrew:
+    _bin: null
+    _desc: Manage your Homebrew formulas with style using Cakebrew.
+    _docs: https://www.cakebrew.com/
+    _github: https://github.com/brunophilipe/Cakebrew
+    _home: http://www.cakebrew.com/
+    _name: Cakebrew
+    _when:cask: '! test -d /Applications/Cakebrew.app'
+    cask: cakebrew
   bitwarden:
     _bin: bitwarden
     _desc: The desktop vault (Windows, macOS, & Linux)
@@ -2565,6 +2593,31 @@ softwarePackages:
     snap: flutter
     yay: flutter
     _type: application
+  pock:
+    _bin: null
+    _desc: Widgets manager for MacBook Touch Bar
+    _docs: https://github.com/pock/pock
+    _github: https://github.com/pock/pock
+    _home: https://pock.app/
+    _name: Pock
+    _when:cask: '! test -d /Applications/Pock.app'
+    cask: pock
+  xcodes:
+    _bin: xcodes
+    _desc: CLI utility to download, install, and switch to alternate versions of Xcode
+    _docs: https://github.com/XcodesOrg/xcodes
+    _github: https://github.com/XcodesOrg/xcodes
+    _home: https://github.com/XcodesOrg/xcodes
+    _name: Xcodes
+    brew:darwin: xcodesorg/made/xcodes
+  xcodes-app:
+    _bin: null
+    _desc: macOS desktop app that allows you to download, install, and switch to alternate versions of Xcode
+    _docs: https://github.com/XcodesOrg/XcodesApp
+    _github: https://github.com/XcodesOrg/XcodesApp
+    _home: https://github.com/XcodesOrg/XcodesApp
+    _name: Xcodes App
+    cask: xcodes
   nitroshare:
     _bin: nitroshare
     _desc: Network file transfer application for Windows, OS X, & Linux