diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore
new file mode 100644
index 0000000..3faf4dd
--- /dev/null
+++ b/.config/zsh/.gitignore
@@ -0,0 +1,4 @@
+/antigen/
+/log/
+/histfile
+/.zcompdump*
diff --git a/.zshrc b/.config/zsh/.zshrc
similarity index 97%
rename from .zshrc
rename to .config/zsh/.zshrc
index 5d7ca21..db1b269 100644
--- a/.zshrc
+++ b/.config/zsh/.zshrc
@@ -54,6 +54,7 @@ antigen bundle zsh-users/zsh-completions
 antigen bundle zsh-users/zsh-autosuggestions
 antigen bundle Tarrasch/zsh-syntax-highlighting
 antigen bundle zsh-users/zsh-history-substring-search
+antigen bundle mafredri/zsh-async
 
 antigen apply
 
@@ -122,3 +123,4 @@ source "$DOTFILES/aliases"
 # Load some manual plugins
 source "$ZSH_DIR/plugins/sudo.zsh"
 source "$ZSH_DIR/plugins/fish-theme.zsh"
+[ -f '/usr/share/fzf/key-bindings.zsh' ] && source /usr/share/fzf/key-bindings.zsh
diff --git a/.profile b/.profile
index 1f930b0..3154887 100644
--- a/.profile
+++ b/.profile
@@ -20,6 +20,10 @@ export VIMINIT=":so $MYVIMRC"
 
 export EDITOR="vim"
 export VISUAL="vim"
+
+# Allow ZSH to load from ~/.config/zsh
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
 export MANPAGER="less -+N"
 export TERMINAL="termite"
 export BROWSER="chromium"