diff --git a/zsh.d/zplug.zsh b/zsh.d/zplug.zsh
new file mode 100644
index 0000000..5aa2e14
--- /dev/null
+++ b/zsh.d/zplug.zsh
@@ -0,0 +1,24 @@
+# vim: ft=zsh
+
+if [[ ! -f '/usr/share/zplug/init.zsh' ]]; then
+    return
+fi
+
+source /usr/share/zplug/init.zsh
+zplug "plugins/git", from:oh-my-zsh
+zplug "plugins/sudo", from:oh-my-zsh
+zplug "plugins/command-not-found", from:oh-my-zsh
+zplug "zsh-users/zsh-syntax-highlighting"
+zplug "zsh-users/zsh-autosuggestions"
+zplug "zsh-users/zsh-history-substring-search"
+zplug "zsh-users/zsh-completions"
+zplug "junegunn/fzf"
+
+if ! zplug check --verbose; then
+    printf "Install? [y/N]: "
+    if read -q; then
+        echo; zplug install
+    fi
+fi
+zplug load
+
diff --git a/zshrc b/zshrc
index 9dd7148..4198628 100644
--- a/zshrc
+++ b/zshrc
@@ -657,28 +657,6 @@ for partial in ${ZDOTDIR}/zsh.d/*.zsh; do
   source $partial
 done
 
-#---------------------------------- Addons ------------------------------------
-
-if [[ -f '/usr/share/zplug/init.zsh' ]]; then
-  source /usr/share/zplug/init.zsh
-  zplug "plugins/git", from:oh-my-zsh
-  zplug "plugins/sudo", from:oh-my-zsh
-  zplug "plugins/command-not-found", from:oh-my-zsh
-  zplug "zsh-users/zsh-syntax-highlighting"
-  zplug "zsh-users/zsh-autosuggestions"
-  zplug "zsh-users/zsh-history-substring-search"
-  zplug "zsh-users/zsh-completions"
-  zplug "junegunn/fzf"
-fi
-
-if ! zplug check --verbose; then
-    printf "Install? [y/N]: "
-    if read -q; then
-        echo; zplug install
-    fi
-fi
-zplug load
-
 #---------------------------------- Broot ------------------------------------
 function br {
     local cmd cmd_file code