diff --git a/.local/share/chezmoi/home/.chezmoidata.yaml b/.local/share/chezmoi/home/.chezmoidata.yaml index f099175d..8ecc73bb 100644 --- a/.local/share/chezmoi/home/.chezmoidata.yaml +++ b/.local/share/chezmoi/home/.chezmoidata.yaml @@ -711,4 +711,4 @@ softwarePlugins: - https://github.com/prettier/vim-prettier.git - https://github.com/tpope/vim-sensible.git - https://github.com/tpope/vim-surround.git - - https://github.com/nanotee/zoxide.vim.git + - https://github.com/nanotee/zoxide.vim.git \ No newline at end of file diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl index 8a102fad..43fe8cbc 100644 --- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl +++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10-install-packages.tmpl @@ -3,17 +3,17 @@ {{- includeTemplate "universal/profile" }} {{- includeTemplate "universal/logg" }} -# software: {{ index .softwareGroups .host.softwareGroup | toString | replace "[" "" | replace "]" "" }} +# software: {{ index .softwareGroups (join "_" .host.softwareGroup) | toString | replace "[" "" | replace "]" "" }} # software map: {{ include (joinPath .chezmoi.homeDir ".local" "share" "chezmoi" "software.yml") | sha256sum }} if command -v install-program > /dev/null; then if command -v zx > /dev/null; then logg info 'Installing packages defined in .chezmoidata.yaml under the .softwareGroups key' - logg info 'Installing: {{ index .softwareGroups .host.softwareGroup | toString | replace "[" "" | replace "]" "" }}' + logg info 'Installing: {{ index .softwareGroups (join "_" .host.softwareGroup) | toString | replace "[" "" | replace "]" "" }}' # Ask for the administrator password upfront logg info 'A sudo password may be required for some of the installations' sudo echo "Sudo access granted." - install-program {{ index .softwareGroups .host.softwareGroup | toString | replace "[" "" | replace "]" "" }} + install-program {{ index .softwareGroups (join "_" .host.softwareGroup) | toString | replace "[" "" | replace "]" "" }} else logg error '`zx` is not available' fi diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_provision.tmpl b/.local/share/chezmoi/home/dot_local/bin/executable_provision.tmpl index d02229f0..3f46d066 100644 --- a/.local/share/chezmoi/home/dot_local/bin/executable_provision.tmpl +++ b/.local/share/chezmoi/home/dot_local/bin/executable_provision.tmpl @@ -226,7 +226,7 @@ if [ ! -f "$HOME/.config/chezmoi/chezmoi.yaml" ]; then if command -v gum > /dev/null; then if [ -z "$SOFTWARE_GROUP" ]; then logg prompt 'Select the software group you would like to install. If your environment is a macOS, Windows, or environment with the DISPLAY environment variable then desktop software will be installed too. The software groups are in the ~/.local/share/chezmoi/home/.chezmoidata.yaml file.' - SOFTWARE_GROUP="$(gum choose "Basic" "Standard" "Development" "Experimental")" + SOFTWARE_GROUP="$(gum choose "Basic" "Standard" "Full")" fi fi