diff --git a/docs/TODO.md b/docs/TODO.md
index 02441d84..dbb521be 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -9,8 +9,6 @@ No such key “color-scheme”
 
 CLOUDFLARE_API_TOKEN
 GMAIL_APP_PASSWORD
-LEXICON_CLOUDFLARE_USERNAME
-LEXICON_CLOUDFLARE_TOKEN
 ### Ensure these PATHs are added on Windows
 add to PATH:
 '%ProgramFiles(x86)%\mitmproxy\bin'
@@ -80,9 +78,6 @@ age:
 
 ## Figure out where these go
 
-AWS_ACCESS_KEY_ID
-AWS_SECRET_ACCESS_KEY
-
 ### Restic
 RESTIC_REPOSITORY_FILE              Name of file containing the repository location (replaces --repository-file)
 RESTIC_REPOSITORY                   Location of repository (replaces -r)
diff --git a/home/dot_bashrc b/home/dot_bashrc
index f0d1c61b..bf9ef062 100644
--- a/home/dot_bashrc
+++ b/home/dot_bashrc
@@ -70,6 +70,17 @@ if [ "$BASH_SUPPORT" = 'true' ]; then
     . "/usr/local/etc/profile.d/bash_completion.sh"
   fi
 
+  ### Bash Completion (Homebrew)
+  if command -v brew  > /dev/null; then
+    if [[ -r "${HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh" ]]; then
+      . "${HOMEBREW_PREFIX}/etc/profile.d/bash_completion.sh"
+    else
+      for COMPLETION in "${HOMEBREW_PREFIX}/etc/bash_completion.d/"*; do
+        [[ -r "${COMPLETION}" ]] && source "${COMPLETION}"
+      done
+    fi
+  fi
+
   ### direnv
   if command -v direnv > /dev/null; then
     eval "$(direnv hook bash)"
diff --git a/home/dot_zshrc b/home/dot_zshrc
index b1e9e25f..5ea66183 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -254,6 +254,10 @@ xterm*|rxvt*|Eterm|aterm|kterm|gnome*|alacritty)
 	;;
 esac
 
+### Homebrew ZSH Completions
+# Must be sourced before compinit / Oh-My-ZSH inclusion
+FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
+
 ### Antigen
 if [ -f "$HOME/.local/scripts/antigen.zsh" ]; then
   source "$HOME/.local/scripts/antigen.zsh"
diff --git a/software.yml b/software.yml
index 741f0492..b2a2eff7 100644
--- a/software.yml
+++ b/software.yml
@@ -740,13 +740,14 @@ softwarePackages:
   bash-completion:
     _bin: null
     _desc: null
-    _docs: null
+    _docs: https://docs.brew.sh/Shell-Completion
     _github: null
     _home: null
     _name: null
     _when:darwin: '! (brew list bash-completion | grep bash-completion)'
+    _when:linux: '! (brew list bash-completion | grep bash-completion)'
     brew:darwin: bash-completion
-    _service: false
+    brew:linux: bash-completion
   axel:
     _bin: axel
     _docs: null