diff --git a/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
index 9c113c75..ac7dae47 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/archlinux/run_onchange_before_10_install-archlinux-dependencies.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "archlinux") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -41,4 +40,3 @@ if ! command -v yay > /dev/null; then
   logg 'Installing yay via `sudo makepkg -si`'
   sudo makepkg -si
 fi
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
index 42288804..55e45711 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/centos/run_onchange_before_10-install-centos-dependencies.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "centos") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -23,4 +22,3 @@ logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}}
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
index b9622273..aadea449 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_10_configure-macos.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.family "darwin") }}
 #!/usr/bin/env bash
 
 set -x
@@ -939,4 +938,3 @@ done
 
 logg 'Done applying macOS settings'
 logg info 'Some of these changes  may require a logout/restart to take effect'
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
index ae2e6ea0..736aed91 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_20-ensure-zsh-macos.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.family "darwin") }}
 #!/usr/bin/env bash
 
 {{- includeTemplate "universal/logg" }}
@@ -15,4 +14,3 @@ if [[ ! -e /usr/local/bin/zsh ]]; then
 fi
 {{- end -}}
 {{- end }}
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_set-wallpaper.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_set-wallpaper.tmpl
index 69b06656..95656d7d 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_set-wallpaper.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_after_set-wallpaper.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.family "darwin") }}
 #!/usr/bin/env bash
 
 # Betelgeuse-macOS wallpaper hash: {{ include (joinPath .chezmoi.homeDir ".local" "src" "betelgeuse" "share" "wallpapers" "Betelgeuse-macOS" "contents" "source.png") | sha256sum }}
@@ -9,4 +8,3 @@ if command -v m > /dev/null && [ -f "$HOME/.local/src/betelgeuse/share/wallpaper
 else
   logg warn 'Either `m` or the macOS default wallpaper is missing.'
 fi
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
index a31d1dff..2a605c39 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-dependencies.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.family "darwin") }}
 #!/usr/bin/env bash
 
 # darwin/Brewfile hash: {{ include (joinPath ".chezmoitemplates" "darwin" "Brewfile") | sha256sum }}
@@ -17,4 +16,3 @@ if command -v brew > /dev/null; then
 else
   logg error '`brew` was not found in the PATH'
 fi
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
index b2f2b957..0e2bd2ea 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/debian/run_onchange_before_10-install-debian-dependencies.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "debian") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -44,4 +43,3 @@ logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends {{ $packages | sortAlpha | uniq | join " " -}}
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
index 6a904b6d..55e45711 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/fedora/run_onchange_before_10-install-fedora-dependencies.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "fedora") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -23,4 +22,3 @@ logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo dnf install -y {{ $packages | sortAlpha | uniq | join " " -}}
-{{ end -}}
\ No newline at end of file
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
index 6c174208..7fac7b91 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/freebsd/run_onchange_before_11-install-freebsd-packages.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "freebsd") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -23,4 +22,3 @@ logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo pkg install -y {{ $packages | sortAlpha | uniq | join " " -}}
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
index d13a8c0f..cffead5a 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/opensuse/run_onchange_before_11-install-opensuse-software.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "opensuse") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -23,4 +22,3 @@ logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 ### Install base dependencies
 sudo zypper install -y {{ $packages | sortAlpha | uniq | join " " -}}
-{{ end -}}
\ No newline at end of file
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
index d2966742..13b2c5a6 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-dependencies.tmpl
@@ -1,4 +1,3 @@
-{{- if (eq .host.distro.id "ubuntu") }}
 #!/usr/bin/env bash
 
 # universal/essential-packages hash: {{ include (joinPath ".chezmoitemplates" "universal" "essential-packages") | sha256sum }}
@@ -44,4 +43,3 @@ logg info 'Dependencies: {{ $packages | sortAlpha | uniq | join " " -}}'
 
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends {{ $packages | sortAlpha | uniq | join " " -}}
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
index c148eb1f..fc46f8bd 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_15_install-asdf-packages.tmpl
@@ -1,5 +1,5 @@
-{{- if (ne .host.distro.family "windows") }}
 #!/usr/bin/env bash
+{{- if (ne .host.distro.family "windows") }}
 
 # dot_tool-versions.tmpl hash: {{ include "dot_tool-versions.tmpl" | sha256sum }}
 
@@ -13,4 +13,5 @@ if [ -f "$ASDF_DIR/asdf.sh" ] && [ -f ~/.tool-versions ]; then
 else
   logg warn 'The `$ASDF_DIR/asdf.sh` or `~/.tool-versions` file is not present'
 fi
-{{ end -}}
\ No newline at end of file
+
+{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-zsh-plugins.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-zsh-plugins.tmpl
index 26422ac8..0a29452f 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-zsh-plugins.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_after_99_bootstrap-zsh-plugins.tmpl
@@ -1,5 +1,5 @@
-{{- if (eq .host.headless true) }}
 #!/usr/bin/env bash
+{{- if (eq .host.headless true) }}
 
 # .zshrc hash: {{ include (joinPath .chezmoi.homeDir ".zshrc")| sha256sum }}
 
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_5-install-homebrew.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_5-install-homebrew.tmpl
index 161b25a7..9b48a2c4 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_5-install-homebrew.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_5-install-homebrew.tmpl
@@ -1,5 +1,5 @@
-{{- if (ne .host.distro.family "windows") }}
 #!/usr/bin/env bash
+{{- if (ne .host.distro.family "windows") }}
 
 {{- includeTemplate "universal/profile" }}
 {{- includeTemplate "universal/logg" }}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_8-install-zx.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_8-install-zx.tmpl
index bab34053..55c0f140 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_8-install-zx.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_8-install-zx.tmpl
@@ -1,5 +1,5 @@
-{{- if (ne .host.distro.family "windows") }}
 #!/usr/bin/env bash
+{{- if (ne .host.distro.family "windows") }}
 
 {{- includeTemplate "universal/profile" }}
 {{- includeTemplate "universal/logg" }}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies.tmpl
index f77780d6..f1f641af 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_10-install-windows-dependencies.tmpl
@@ -1,3 +1 @@
-{{- if (eq .host.distro.family "windows") }}
 #!/usr/bin/env bash
-{{ end -}}
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages.tmpl
index f77780d6..f1f641af 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/windows/run_onchange_before_11-install-windows-packages.tmpl
@@ -1,3 +1 @@
-{{- if (eq .host.distro.family "windows") }}
 #!/usr/bin/env bash
-{{ end -}}