diff --git a/base/arch-desktop/env.zsh b/base/arch-desktop/env.zsh
index 5510cc14..11b5b099 100644
--- a/base/arch-desktop/env.zsh
+++ b/base/arch-desktop/env.zsh
@@ -3,3 +3,12 @@ export GNUPGHOME="$XDG_CONFIG_HOME/gpg"
 export GTK2_RC_FILES="${0:A:h}/config/gtk-2.0/gtkrc"
 export URXVT_PERL_LIB="$XDG_CONFIG_HOME/urxvt"
 export QT_QPA_PLATFORMTHEME=gtk2
+
+_is_running ssh-agent || {
+  ssh-agent -s >"$XDG_RUNTIME_DIR/ssh-agent-env"
+}
+_is_running gpg-agent || {
+  gpg-agent --daemon >"$XDG_RUNTIME_DIR/gpg-agent-env"
+}
+_source "$XDG_RUNTIME_DIR/ssh-agent-env" >/dev/null
+_source "$XDG_RUNTIME_DIR/gpg-agent-env" >/dev/null
diff --git a/base/arch/env.zsh b/base/arch/env.zsh
index 5be8fcac..5190d1e9 100644
--- a/base/arch/env.zsh
+++ b/base/arch/env.zsh
@@ -1,11 +1,2 @@
 export GNUPGHOME="$XDG_CONFIG_HOME/gpg"
 export TERMINFO="$XDG_CONFIG_HOME/terminfo"
-
-_is_running ssh-agent || {
-  ssh-agent -s >"$XDG_RUNTIME_DIR/ssh-agent-env"
-}
-_is_running gpg-agent || {
-  gpg-agent --daemon >"$XDG_RUNTIME_DIR/gpg-agent-env"
-}
-_source "$XDG_RUNTIME_DIR/ssh-agent-env" >/dev/null
-_source "$XDG_RUNTIME_DIR/gpg-agent-env" >/dev/null