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

Latest

Browse source
This commit is contained in:
Brian Zalewski 2024-01-02 01:14:45 +00:00
parent 194050cbb3
commit a60064997c
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
home/.chezmoi.yaml.tmpl
View file

@ -207,11 +207,14 @@ data:
username: "{{ default "user" (env "USER") }}"
weatherZipCode: 07960
diff:
pager: delta
pager: git
command: delta
args:
- "--paging"
- never
exclude:
- externals
- scripts
edit:
command: code
args:

2
home/.chezmoiscripts/universal/run_before_02-homebrew.sh.tmpl
View file

@ -133,7 +133,7 @@ upgradeDarwin() {
### Run upgrade process
logg info 'Listing available OS upgrades'
UPDATE_CHECK="$(softwareupdate -l)"
if [ "$UPDATE_CHECK" != "No new software available." ]; then
if ! echo "$UPDATE_CHECK" | grep "No new software available" > /dev/null; then
logg info 'Applying OS upgrades (if available). This may take awhile..'
expect -c "set timeout -1
spawn sudo softwareupdate -i -a --agree-to-license

6
home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
View file

@ -89,9 +89,9 @@ configureGPG() {
dirmngr --daemon --standard-resolver
KEYID_TRIMMED="$(echo "$KEYID" | sed 's/^0x//')"
if ! gpg --list-secret-keys --keyid-format=long | grep "$KEYID_TRIMMED" > /dev/null; then
if [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/home/private_dot_gnupg/public/${KEYID}.asc" ]; then
logg info "Importing GPG key stored in ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/home/private_dot_gnupg/public/${KEYID}.asc since its name matches the GPG key ID in .chezmoi.yaml.tmpl"
gpg --import "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/home/private_dot_gnupg/public/${KEYID}.asc" && logg success 'Successfully imported master GPG key'
if [ -f "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/home/private_dot_gnupg/private_public/private_${KEYID}.asc" ]; then
logg info "Importing GPG key stored in ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/home/private_dot_gnupg/private_public/private_${KEYID}.asc since its name matches the GPG key ID in .chezmoi.yaml.tmpl"
gpg --import "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/home/private_dot_gnupg/private_public/private_${KEYID}.asc" && logg success 'Successfully imported master GPG key'
else
logg info 'Attempting to download the specified public GPG key ({{ .user.gpg.id }}) from public keyservers'
gpg --keyserver https://pgp.mit.edu --recv "$KEYID" || EXIT_CODE=$?