diff --git a/.chezmoiignore b/.chezmoiignore
index a87441c..858b9a7 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -1,6 +1,6 @@
 README.md
 
-{{ if eq .chezmoi.hostname "daybreak" }}
+{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") }}
 .config/beets
 .config/davfs2/secrets
 .config/kitty
@@ -9,21 +9,3 @@ README.md
 .config/waybar
 .local/share/gnupg/sshcontrol
 {{ end }}
-
-{{ if eq .chezmoi.hostname "epoch" }}
-.config/beets
-.config/davfs2/secrets
-.config/kitty
-.config/kitty/kitty-gruvbox-theme
-.config/sway
-.config/waybar
-.local/share/gnupg/sshcontrol
-{{ end }}
-
-{{ if eq .chezmoi.hostname "UGC13335X84" }}
-.config/beets
-.config/davfs2/secrets
-.config/sway
-.config/waybar
-.local/share/gnupg/sshcontrol
-{{ end }}