diff --git a/.zshenv b/.zshenv
index 7e9a17a..0301067 100644
--- a/.zshenv
+++ b/.zshenv
@@ -60,9 +60,5 @@ if command -v bat >/dev/null; then
 	export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 fi
 
-# Uncrustify
-export UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/uncrustify.cfg"
-[ ! -r "${UNCRUSTIFY_CONFIG}" ] && unset UNCRUSTIFY_CONFIG
-
 [ -r "$ZDOTDIR/.zshenv.user" ] && source "$ZDOTDIR/.zshenv.user"
 
diff --git a/apps.d/uncrustify.zsh b/apps.d/uncrustify.zsh
new file mode 100644
index 0000000..7ec83e5
--- /dev/null
+++ b/apps.d/uncrustify.zsh
@@ -0,0 +1,8 @@
+# shellcheck shell=bash
+# vim: ft=sh
+
+if command -v uncrustify >/dev/null; then
+	UNCRUSTIFY_CONFIG="${XDG_CONFIG_HOME}/uncrustify/uncrustify.cfg"
+	[ -r "${UNCRUSTIFY_CONFIG}" ] && export UNCRUSTIFY_CONFIG
+fi
+