From 3d3f4f04d84d8398e230bfce96d3abd31457b925 Mon Sep 17 00:00:00 2001
From: Daniel Carrillo <daniel.carrillo@gmail.com>
Date: Sat, 11 Jul 2026 18:29:16 +0200
Subject: [PATCH] Load brew installed commands autocompletion

---
 .zshrc | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.zshrc b/.zshrc
index b0bf585..4be3b92 100644
--- a/.zshrc
+++ b/.zshrc
@@ -7,6 +7,12 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
+# Add homebrew-installed package completions to fpath
+if command -v brew > /dev/null; then
+  export BREW_PREFIX=$(brew --prefix)
+  fpath+=$(brew --prefix)/share/zsh/site-functions
+fi
+
 # Source Prezto.
 if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
   source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh"
@@ -52,7 +58,7 @@ alias k=kubectl
 alias kgy='kubectl get -o yaml'
 alias kready='kubectl get --raw="/readyz?verbose"'
 case $(uname) in
-  Darwin) alias ls='$(brew --prefix)/bin/gls --group-directories-first --color=auto --hyperlink=auto' ;;
+  Darwin) alias ls='$BREW_PREFIX/bin/gls --group-directories-first --color=auto --hyperlink=auto' ;;
   Linux)  alias ls='ls --group-directories-first --color=auto --hyperlink=auto' ;;
 esac
 alias neovim=nvim
@@ -133,8 +139,8 @@ export PAGER='less'
 ##### fzf #####
 
 case $(uname) in
-  Darwin) source "$(brew --prefix)/opt/fzf/shell/key-bindings.zsh"
-          source "$(brew --prefix)/opt/fzf/shell/completion.zsh" ;;
+  Darwin) source "$BREW_PREFIX/opt/fzf/shell/key-bindings.zsh"
+          source "$BREW_PREFIX/opt/fzf/shell/completion.zsh" ;;
   Linux)  source /usr/share/fzf/key-bindings.zsh
           source /usr/share/fzf/completion.zsh ;;
 esac
@@ -166,8 +172,6 @@ eval "$(atuin init zsh)"
 # aws cli zsh autocomplete
 case $(uname) in
   Linux) source /usr/bin/aws_zsh_completer.sh ;;
-  Darwin) autoload bashcompinit && bashcompinit
-          complete -C "$(brew --prefix)/bin/aws_completer" aws ;;
 esac
 
 # custom device