diff --git a/private_dot_config/chezmoi/chezmoi.toml.tmpl b/private_dot_config/chezmoi/chezmoi.toml.tmpl
index a592c0d..4284a80 100644
--- a/private_dot_config/chezmoi/chezmoi.toml.tmpl
+++ b/private_dot_config/chezmoi/chezmoi.toml.tmpl
@@ -8,8 +8,6 @@ encryption = "age"
     {{- if eq .chezmoi.os "linux" }}
     {{-   if (.chezmoi.kernel.osrelease | lower | contains "arch") }}
     distro = "arch"
-    {{-   else if (.chezmoi.kernel.osrelease | lower | contains "debian") }}
-    distro = "debian"
     {{-   end }}
     {{- end }}
 
@@ -35,30 +33,35 @@ encryption = "age"
     autoCommit = true
     autoPush = true
     commitMessageTemplate = """\
+    {{ "{{-" }} $files := index . "files" {{ "}}" }}
+    {{ "{{-" }} if not (and $files (gt (len $files) 0)) {{ "}}" }}
+    chore: Files removed or no specific files modified.
+    {{ "{{-" }} else {{ "}}" }}
     {{ "{{-" }} $path := list {{ "}}" }}
-    {{ "{{-" }} range .files {{ "}}" }}
+    {{ "{{-" }} range $files {{ "}}" }}
     {{ "{{-" }} $path = append $path .path {{ "}}" }}
     {{ "{{-" }} end {{ "-}}" }}
     {{ "{{-" }} $firstFile := index $path 0 {{ "-}}" }}
     {{ "{{-" }} $dir := dir $firstFile {{ "-}}" }}
 
     {{ "{{-" }} if contains "encrypted_" $firstFile {{ "-}}" }}
-    security(secret): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple encrypted files{{ "{{" }} end {{ "}}" }}
+    security(secret): {{ "{{" }} if eq (len $files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple encrypted files{{ "{{" }} end {{ "}}" }}
     {{ "{{-" }} else if contains "scripts/" $firstFile {{ "-}}" }}
-    script({{ "{{" }} $dir {{ "}}" }}): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple script files{{ "{{" }} end {{ "}}" }}
+    script({{ "{{" }} $dir {{ "}}" }}): {{ "{{" }} if eq (len $files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple script files{{ "{{" }} end {{ "}}" }}
     {{ "{{-" }} else if contains "exact_" $firstFile {{ "-}}" }}
-    chore(external): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update external dependencies{{ "{{" }} end {{ "}}" }}
+    chore(external): {{ "{{" }} if eq (len $files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update external dependencies{{ "{{" }} end {{ "}}" }}
     {{ "{{-" }} else {{ "-}}" }}
-    chore({{ "{{" }} $dir {{ "}}" }}): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple files{{ "{{" }} end {{ "}}" }}
+    chore({{ "{{" }} $dir {{ "}}" }}): {{ "{{" }} if eq (len $files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple files{{ "{{" }} end {{ "}}" }}
     {{ "{{-" }} end {{ "}}" }}
 
-    {{ "{{-" }} if gt (len .files) 1 {{ "}}" }}
+    {{ "{{-" }} if gt (len $files) 1 {{ "}}" }}
 
     Modified files:
-    {{ "{{-" }} range .files {{ "}}" }}
+    {{ "{{-" }} range $files {{ "}}" }}
     {{ "- {{" }} .path {{ "}}" }}
     {{ "{{-" }} end {{ "}}" }}
-    {{ "{{-" }} end {{ "-}}" }}
+    {{ "{{-" }} end {{ "}}" }}
+    {{ "{{-" }} end {{ "}}" }}
     """
 
 [git.commit]