diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index af444d2..a702608 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -1,4 +1,9 @@
-{{ $passphrase := promptStringOnce . "passphrase" "passphrase" -}}
+{{- $passphrase := promptStringOnce . "passphrase" "passphrase" -}}
+
+{{- $osid := .chezmoi.os -}}
+{{- if hasKey .chezmoi.osRelease "id" -}}
+{{-   $osid = printf "%s-%s" .chezmoi.os .chezmoi.osRelease.id -}}
+{{- end -}}
 
 progress = true
 
@@ -16,6 +21,7 @@ args = ["--batch", "--passphrase", {{ $passphrase | quote }}, "--no-symkey-cache
   gpgKey = {{ output "get-gpg-key" | trim | quote }}
 {{- end }}
 passphrase = {{ $passphrase | quote }}
+osid = {{ $osid | quote }}
 
 [data.drapeau]
 colorscheme = 'catppuccin-macchiato'
diff --git a/.chezmoiexternals/awesomewm.toml b/.chezmoiexternals/awesomewm.toml
index 1734502..759119f 100644
--- a/.chezmoiexternals/awesomewm.toml
+++ b/.chezmoiexternals/awesomewm.toml
@@ -1,3 +1,4 @@
+{{- if eq .osid "linux-arch" -}}
 [".config/awesome/lib/bling"]
 type = "git-repo"
 url = "https://github.com/BlingCorp/bling.git"
@@ -17,3 +18,4 @@ refreshPeriod = "672h"
 type = "git-repo"
 url = "https://github.com/andOrlando/rubato.git"
 refreshPeriod = "672h"
+{{- end -}}
diff --git a/.chezmoiexternals/rofi.toml b/.chezmoiexternals/rofi.toml
index f5bd8f4..5230a08 100644
--- a/.chezmoiexternals/rofi.toml
+++ b/.chezmoiexternals/rofi.toml
@@ -1,3 +1,4 @@
+{{- if eq .osid "linux-arch" -}}
 [".local/share/rofi/themes/catppuccin-frappe.rasi"]
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/rofi/main/basic/.local/share/rofi/themes/catppuccin-frappe.rasi"
@@ -17,3 +18,4 @@ refreshPeriod = "672h"
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/rofi/main/basic/.local/share/rofi/themes/catppuccin-mocha.rasi"
 refreshPeriod = "672h"
+{{- end -}}
diff --git a/.chezmoiexternals/zathura.toml b/.chezmoiexternals/zathura.toml
index 8109143..8e20ff7 100644
--- a/.chezmoiexternals/zathura.toml
+++ b/.chezmoiexternals/zathura.toml
@@ -1,3 +1,4 @@
+{{- if ne .chezmoi.hostname "marleycentre" -}}
 [".config/zathura/catppuccin-frappe"]
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-frappe"
@@ -17,3 +18,4 @@ refreshPeriod = "672h"
 type = "file"
 url = "https://raw.githubusercontent.com/catppuccin/zathura/main/src/catppuccin-mocha"
 refreshPeriod = "672h"
+{{- end -}}
diff --git a/.chezmoiscripts/run_once_before_00-aur.sh.tmpl b/.chezmoiscripts/run_once_before_00-aur.sh.tmpl
index 81c9ff0..5687eaf 100644
--- a/.chezmoiscripts/run_once_before_00-aur.sh.tmpl
+++ b/.chezmoiscripts/run_once_before_00-aur.sh.tmpl
@@ -1,4 +1,4 @@
-{{ if (and (eq .chezmoi.osRelease.id "arch") (not (lookPath "yay"))) -}}
+{{- if (and (eq .chezmoi.osRelease.id "arch") (not (lookPath "yay"))) -}}
 #!/usr/bin/env bash
 
 sudo pacman -S --needed git base-devel