diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl index efa10cee..b556b18a 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl +++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl @@ -3,7 +3,7 @@ {{- includeTemplate "universal/profile" }} {{- includeTemplate "universal/logg" }} -# software: {{ join (get .softwareGroups .host.softwareGroup) " " }} +# software: {{ join (index .softwareGroups .host.softwareGroup) " " }} if command -v install-software > /dev/null; then logg 'Installing packages defined in .chezmoidata.yaml under the .softwareGroups key' diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/profile b/dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/profile index f79f4554..70734e3c 100644 --- a/dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/profile +++ b/dotfiles/.local/share/chezmoi/home/.chezmoitemplates/universal/profile @@ -15,7 +15,10 @@ if [ -d /home/linuxbrew/.linuxbrew/bin ]; then export INFOPATH="/home/linuxbrew/.linuxbrew/share/info:${INFOPATH:-}" export WHALEBREW_INSTALL_PATH="/home/linuxbrew/.linuxbrew/whalebrew" elif [ -f /opt/homebrew/bin/brew ]; then - eval $(/opt/homebrew/bin/brew shellenv) + eval "$(/opt/homebrew/bin/brew shellenv)" elif [ -f /usr/local/bin/brew ]; then - eval $(/usr/local/bin/brew shellenv) + eval "$(/usr/local/bin/brew shellenv)" fi + +### Ensure ~/.local/bin in PATH +export PATH="$HOME/.local/bin:$PATH"