This commit is contained in:
Brian Zalewski 2024-01-02 02:33:04 +00:00
parent 42040c6ce2
commit daf4fccf0a
5 changed files with 15 additions and 6 deletions

View file

@ -208,6 +208,7 @@ data:
weatherZipCode: 07960 weatherZipCode: 07960
diff: diff:
command: delta command: delta
pager: delta
format: git format: git
args: args:
- "--paging" - "--paging"

View file

@ -1,5 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
{{ includeTemplate "universal/profile" }}
{{ includeTemplate "universal/logg" }}
# @description Copies the `~/.config/shell/exports.sh` file to `/etc/zshenv` so that non-interactive ZSH sessions have all of the same # @description Copies the `~/.config/shell/exports.sh` file to `/etc/zshenv` so that non-interactive ZSH sessions have all of the same
# environment PATH variables as interactive sessions. This was initially required to make Cakebrew work on macOS. # environment PATH variables as interactive sessions. This was initially required to make Cakebrew work on macOS.
addZshEnv() { addZshEnv() {

View file

@ -645,7 +645,8 @@ runChezmoi() {
logg info 'Running chezmoi apply forcefully because HEADLESS_INSTALL is set' logg info 'Running chezmoi apply forcefully because HEADLESS_INSTALL is set'
FORCE_MODIFIER="--force" FORCE_MODIFIER="--force"
fi fi
KEEP_GOING_MODIFIER="" # TODO: https://github.com/twpayne/chezmoi/discussions/3448
KEEP_GOING_MODIFIER="-k"
if [ -n "$KEEP_GOING" ]; then if [ -n "$KEEP_GOING" ]; then
logg info 'Instructing chezmoi to keep going in the case of errors because KEEP_GOING is set' logg info 'Instructing chezmoi to keep going in the case of errors because KEEP_GOING is set'
KEEP_GOING_MODIFIER="-k" KEEP_GOING_MODIFIER="-k"

View file

@ -586,15 +586,17 @@ ensureHomebrewDeps() {
# @description Ensure the `${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi` directory is cloned and up-to-date using the previously # @description Ensure the `${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi` directory is cloned and up-to-date using the previously
# set `START_REPO` as the source repository. # set `START_REPO` as the source repository.
cloneChezmoiSourceRepo() { cloneChezmoiSourceRepo() {
if ! git config --get --global http.postBuffer > /dev/null; then
logg info 'Setting git http.postBuffer value high for large source repository' && git config --global http.postBuffer 524288000
fi
if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/.git" ]; then if [ -d "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi/.git" ]; then
logg info "Changing directory to ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && cd "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" logg info "Changing directory to ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && cd "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi"
if ! git config --get http.postBuffer > /dev/null; then
logg info 'Setting git http.postBuffer value high for large source repository' && git config http.postBuffer 524288000
fi
logg info "Pulling the latest changes in ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && git pull origin master logg info "Pulling the latest changes in ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && git pull origin master
else else
logg info "Ensuring ${XDG_DATA_HOME:-$HOME/.local/share} is a folder" && mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}" logg info "Ensuring ${XDG_DATA_HOME:-$HOME/.local/share} is a folder" && mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}"
logg info "Cloning ${START_REPO} to ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && git clone "${START_REPO}" "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" logg info "Cloning ${START_REPO} to ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && git clone "${START_REPO}" "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi"
logg info "Changing directory to ${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi" && cd "${XDG_DATA_HOME:-$HOME/.local/share}/chezmoi"
logg info 'Setting git http.postBuffer value high for large source repository' && git config http.postBuffer 524288000
fi fi
} }
@ -643,7 +645,8 @@ runChezmoi() {
logg info 'Running chezmoi apply forcefully because HEADLESS_INSTALL is set' logg info 'Running chezmoi apply forcefully because HEADLESS_INSTALL is set'
FORCE_MODIFIER="--force" FORCE_MODIFIER="--force"
fi fi
KEEP_GOING_MODIFIER="" # TODO: https://github.com/twpayne/chezmoi/discussions/3448
KEEP_GOING_MODIFIER="-k"
if [ -n "$KEEP_GOING" ]; then if [ -n "$KEEP_GOING" ]; then
logg info 'Instructing chezmoi to keep going in the case of errors because KEEP_GOING is set' logg info 'Instructing chezmoi to keep going in the case of errors because KEEP_GOING is set'
KEEP_GOING_MODIFIER="-k" KEEP_GOING_MODIFIER="-k"

View file

@ -337,7 +337,8 @@ runChezmoi() {
logg info 'Running chezmoi apply forcefully because HEADLESS_INSTALL is set' logg info 'Running chezmoi apply forcefully because HEADLESS_INSTALL is set'
FORCE_MODIFIER="--force" FORCE_MODIFIER="--force"
fi fi
KEEP_GOING_MODIFIER="" # TODO: https://github.com/twpayne/chezmoi/discussions/3448
KEEP_GOING_MODIFIER="-k"
if [ -n "$KEEP_GOING" ]; then if [ -n "$KEEP_GOING" ]; then
logg info 'Instructing chezmoi to keep going in the case of errors because KEEP_GOING is set' logg info 'Instructing chezmoi to keep going in the case of errors because KEEP_GOING is set'
KEEP_GOING_MODIFIER="-k" KEEP_GOING_MODIFIER="-k"