From f2e9a1b39306dbc5c53319a0186d959c8377cde8 Mon Sep 17 00:00:00 2001
From: punkfairie <23287005+punkfairie@users.noreply.github.com>
Date: Sun, 21 Apr 2024 17:28:42 -0700
Subject: [PATCH] Update .config/packages/install-brew-packages.fish Update
 .config/topgrade.d/01-commands.toml

---
 .../run_onchange_before_install-brew-packages.fish.tmpl   | 2 +-
 dot_config/topgrade.d/01-commands.toml.tmpl               | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dot_config/packages/run_onchange_before_install-brew-packages.fish.tmpl b/dot_config/packages/run_onchange_before_install-brew-packages.fish.tmpl
index 38859b3..54848ea 100644
--- a/dot_config/packages/run_onchange_before_install-brew-packages.fish.tmpl
+++ b/dot_config/packages/run_onchange_before_install-brew-packages.fish.tmpl
@@ -3,5 +3,5 @@
 
 #{{ include "dot_config/packages/Brewfile" | sha256sum }}
 
-brew bundle install --file "$HOME/.config/packages/Brewfile"
+brew bundle install --file {{ joinPath .chezmoi.homeDir ".config/packages/Brewfile" }}
 {{- end -}}
diff --git a/dot_config/topgrade.d/01-commands.toml.tmpl b/dot_config/topgrade.d/01-commands.toml.tmpl
index ece1cfd..cfbbff9 100644
--- a/dot_config/topgrade.d/01-commands.toml.tmpl
+++ b/dot_config/topgrade.d/01-commands.toml.tmpl
@@ -11,6 +11,8 @@
 # Custom commands
 [commands]
 "Fish Shell Completions" = "fish_update_completions"
-{{- if lookPath "yay" }}
-"Update package list" = "-i yay -Qeq > {{ joinPath .chezmoi.sourceDir "dot_config/packages/" .chezmoi.hostname }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'; exit"
-{{- end -}}
+{{ if lookPath "yay" -}}
+"Update package list" = "yay -Qeq > {{ joinPath .chezmoi.sourceDir 'dot_config/packages/' .chezmoi.hostname }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'"
+{{ end -}}
+{{if lookPath "brew" -}}
+"Update Brewfile" = "brew bundle dump --describe --force --file={{ joinPath .chezmoi.sourceDir 'dot_config/packages/Brewfile' }} && set_color green && printf '%s'  && set_color normal && printf '%s' ' done\n'"