diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
index 6b37f121..be324332 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
@@ -30,4 +30,4 @@ if ! command -v yay > /dev/null; then
   logg 'Installing yay'
   makepkg -si
 fi
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_11-install-archlinux-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_11-install-archlinux-packages
index 89bc10bf..13475589 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_11-install-archlinux-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_11-install-archlinux-packages
@@ -2,4 +2,4 @@
 {{- if eq .host.distro.id "arch" }}
 {{ $supportedManagers := (list "flatpak" "snap" "whalebrew" "pacman" "brew" "yay" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary") }}
 
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies
index 5f60dff8..040ed4f2 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies
@@ -13,4 +13,4 @@ logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
 ### Install base dependencies
 sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}}
 
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-packages
index 1e687de0..98c5faa4 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-packages
@@ -2,4 +2,4 @@
 {{- if eq .host.distro.id "centos" }}
 {{ $supportedManagers := (list "flatpak" "snap" "whalebrew" "dnf" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary") }}
 
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
index 7e54f8de..717c1441 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
@@ -476,4 +476,4 @@ sudo chflags nohidden ~/Library
 # Show the /Volumes folder
 sudo chflags nohidden /Volumes
 {{- end -}}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
index 524b07b0..1389a66a 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
@@ -19,4 +19,4 @@ if [[ ! -e /usr/local/bin/zsh ]]; then
 fi
 {{- end -}}
 {{- end -}}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
index c8aea095..252822ca 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
@@ -25,4 +25,4 @@ logg 'Additional dependencies for GNU compatibility: coreutils findutils gawk gn
 brew bundle --verbose --no-lock --file=/dev/stdin <<EOF
 {{ includeTemplate "darwin/Brewfile" . }}
 EOF
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages
index 3e234721..15f446d5 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_11-install-darwin-packages
@@ -10,4 +10,4 @@
 
 # Examples of /etc/os-release values https://gist.github.com/natefoo/814c5bf936922dad97ff
 # Example fromJson with include from file https://github.com/twpayne/chezmoi/issues/1369
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies
index 2a571383..e7ad619c 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies
@@ -35,4 +35,4 @@ logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
 
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends {{ $packages | sortAlpha | uniq | join " " -}}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages
index ad94ac01..ea8df1f1 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_11-install-debian-packages
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 {{- if eq .host.distro.id "debian" }}
 {{ $supportedManagers := (list "flatpak" "snap" "whalebrew" "apt" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary") }}
-{{- end -}}
-
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies
index 0e758c53..092ff3a4 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies
@@ -12,5 +12,4 @@ logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
 
 ### Install base dependencies
 sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}}
-
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages
index d9d54070..c35d6a62 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_11-install-fedora-packages
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 {{- if eq .host.distro.id "fedora" }}
 {{ $supportedManagers := (list "flatpak" "snap" "whalebrew" "dnf" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary") }}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies
index 5cbb993e..49eba19f 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_10-install-freebsd-dependencies
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 {{- if eq .host.distro.id "opensuse" }}
 {{ $supportedManagers := (list "whalebrew" "pkg" "go" "cargo" "npm" "gem") }}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages
index d8ae782a..f1ed11b6 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages
@@ -12,6 +12,5 @@ logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
 
 ### Install base dependencies
 sudo pkg install -y {{ $packages | sortAlpha | uniq | join " " -}}
-
-{{- end -}}
+{{- end }}
 
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages
index e49a8aeb..dce42c8a 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-packages
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 {{- if eq .host.distro.id "opensuse" }}
 {{ $supportedManagers := (list "flatpak" "snap" "whalebrew" "zypper" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary") }}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software
index 6777c93f..3864ea44 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software
@@ -13,4 +13,4 @@ logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
 ### Install base dependencies
 sudo zypper install -y {{ $packages | sortAlpha | uniq | join " " -}}
 
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
index 2a571383..e7ad619c 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
@@ -35,4 +35,4 @@ logg "Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}"
 
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends {{ $packages | sortAlpha | uniq | join " " -}}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages
index 3b65312f..64ae5f34 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_11-install-packages
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
 {{- if eq .host.distro.id "ubuntu" }}
 {{- $supportedManagers := (list "flatpak" "snap" "whalebrew" "apt" "brew" "go" "cargo" "npm" "pipx" "gem" "appimage" "binary") }}
-{{- end -}}
-
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10_install-aqua-packages.sh.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10_install-aqua-packages.sh.tmpl
index 4b1854b9..2730f7a0 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10_install-aqua-packages.sh.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_10_install-aqua-packages.sh.tmpl
@@ -20,4 +20,4 @@ logg 'Updating Aqua'
 aqua update-aqua
 logg 'Installing Aqua dependencies (if any are defined)'
 aqua install -a
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
index 5dd6296f..fa40b2e0 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
@@ -13,4 +13,4 @@ if [ -f "$ASDF_DIR/asdf.sh" ] && [ -f ~/.tool-versions ]; then
 else
   logg 'The `$ASDF_DIR/asdf.sh` or `~/.tool-versions` file is not present'
 fi
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab
index 818d45cd..fdd536a5 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_50-crontab
@@ -7,4 +7,4 @@ source "$HOME/.config/shell/exports"
 logg 'Installing crontab jobs'
 
 crontab < "$XDG_CONFIG_HOME/crontab/config"
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_60-cleanup b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_60-cleanup
index 3c8f207e..70b95451 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_60-cleanup
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_60-cleanup
@@ -22,10 +22,10 @@ if command -v gsed > /dev/null; then
 else
   logg 'Unable to fix `~/.local/Taskfile.yml` because gsed GNU compatibility tool is not installed.'
 fi
-{{ end }}
+{{- end }}
 
 {{ else if chezmoi.os "windows" }}
 
 Remove-Item -LiteralPath "$env:HOMEPATH\Library" -Force -Recurse
 
-{{ end }}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions
index 5c51af45..cc2211dc 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_80-bash-completions
@@ -168,4 +168,4 @@ if command -v zoxide >/dev/null; then
 elif [ -f "$COMPLETION_DIR/zoxide.bash" ]; then
   rm "$COMPLETION_DIR/zoxide.bash"
 fi
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
index 386e92f3..02a91acf 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-z4h.tmpl
@@ -7,4 +7,4 @@ source "$HOME/.config/shell/exports"
 logg 'Bootstrapping Z4H'
 
 Z4H_BOOTSTRAPPING=1 exec zsh && exit 0
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
index 3454d403..640e8e23 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_1-logging-deps
@@ -69,4 +69,4 @@ echo "Ensuring Gum and Glow are installed (for logging)"
 installGlow &
 installGum &
 wait
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies
index 7d5c660b..0eec2b4a 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 {{- if eq .host.distro.id "windows" }}
-{{- end -}}
+{{- end }}
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages
index 5a5e2f46..7dd8143b 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages
@@ -2,4 +2,4 @@
 {{- if eq .host.distro.id "windows" }}
 {{ $supportedManagers := (list "whalebrew" "choco" "scoop" "winget" "go" "cargo" "npm" "pipx" "gem" "binary") }}
 
-{{- end -}}
+{{- end }}