punkfairie/install.fairie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl, dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl

Browse source
This commit is contained in:
Brian Zalewski 2022-11-24 20:30:14 +00:00
parent 4d1ac31194
commit 00576156d4
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
View file

@ -5,7 +5,7 @@ set -x
# Required for PATHs (including logging) # Required for PATHs (including logging)
source "$HOME/.config/shell/exports" source "$HOME/.config/shell/exports"
logg 'Applying power user optimized macOS settings' logg 'Applying optimized macOS settings'
# Close any open System Preferences panes, to prevent them from overriding # Close any open System Preferences panes, to prevent them from overriding
# settings we’re about to change # settings we’re about to change
@ -937,4 +937,5 @@ for app in "Activity Monitor" \
killall "${app}" &> /dev/null killall "${app}" &> /dev/null
done done
logg success "Done. Note that some of these changes require a logout/restart to take effect." logg 'Done applying macOS settings'
logg info 'Some of these changes may require a logout/restart to take effect'

7
dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
View file

@ -1,14 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
{{- if eq .host.distro.id "darwin" }}
set -eufo pipefail
# Required for PATHs (including logging) # Required for PATHs (including logging)
source "$HOME/.config/shell/exports" source "$HOME/.config/shell/exports"
logg 'Ensuring ZSH is set as the default shell'
{{- if (not .host.restricted) }} {{- if (not .host.restricted) }}
logg 'Ensuring ZSH is set as the default shell'
if ! grep -qc "/usr/local/bin/zsh" /etc/shells; then if ! grep -qc "/usr/local/bin/zsh" /etc/shells; then
echo "/usr/local/bin/zsh" | sudo tee -a /etc/shells > /dev/null echo "/usr/local/bin/zsh" | sudo tee -a /etc/shells > /dev/null
fi fi
@ -18,5 +14,4 @@ if [[ ! -e /usr/local/bin/zsh ]]; then
sudo ln -sf /opt/homebrew/bin/zsh /usr/local/bin/zsh sudo ln -sf /opt/homebrew/bin/zsh /usr/local/bin/zsh
fi fi
{{- end -}} {{- end -}}
{{- end -}}
{{- end }} {{- end }}