Merge branch 'ProfessorManhattan-master-patch-77786' into 'master'
Update .local/share/chezmoi/home/.chezmoidata.yaml,... See merge request megabyte-labs/misc/dotfiles!7
This commit is contained in:
commit
2d17738bc1
3 changed files with 5 additions and 5 deletions
|
@ -3,17 +3,17 @@
|
||||||
{{- includeTemplate "universal/profile" }}
|
{{- includeTemplate "universal/profile" }}
|
||||||
{{- includeTemplate "universal/logg" }}
|
{{- 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 }}
|
# software map: {{ include (joinPath .chezmoi.homeDir ".local" "share" "chezmoi" "software.yml") | sha256sum }}
|
||||||
|
|
||||||
if command -v install-program > /dev/null; then
|
if command -v install-program > /dev/null; then
|
||||||
if command -v zx > /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 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
|
# Ask for the administrator password upfront
|
||||||
logg info 'A sudo password may be required for some of the installations'
|
logg info 'A sudo password may be required for some of the installations'
|
||||||
sudo echo "Sudo access granted."
|
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
|
else
|
||||||
logg error '`zx` is not available'
|
logg error '`zx` is not available'
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -226,7 +226,7 @@ if [ ! -f "$HOME/.config/chezmoi/chezmoi.yaml" ]; then
|
||||||
if command -v gum > /dev/null; then
|
if command -v gum > /dev/null; then
|
||||||
if [ -z "$SOFTWARE_GROUP" ]; 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.'
|
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue