diff --git a/brew.sh b/brew.sh
index 2b49611..8999f37 100755
--- a/brew.sh
+++ b/brew.sh
@@ -30,6 +30,7 @@ brew install zsh
 # Install other useful utilities
 brew install ack
 brew install age
+brew install atuin
 brew install awscli
 brew install b3sum
 brew install bat
@@ -48,7 +49,6 @@ brew install gnupg
 brew install hexyl
 brew install jq
 brew install lazygit
-brew install mcfly
 brew install neovim
 brew install p7zip
 brew install pcre
diff --git a/sheldon.toml b/sheldon.toml
index dfce8a1..f46684b 100644
--- a/sheldon.toml
+++ b/sheldon.toml
@@ -92,10 +92,6 @@ hooks.post = "fi"
 github = "ajeetdsouza/zoxide"
 apply = ["defer"]
 
-[plugins.mcfly]
-github = "cantino/mcfly"
-apply = ["defer"]
-
 [plugins.zsh-ssh]
 github = 'sunlei/zsh-ssh'
 apply = ["defer"]
diff --git a/zshrc.zsh b/zshrc.zsh
index 2d683f8..d422f76 100644
--- a/zshrc.zsh
+++ b/zshrc.zsh
@@ -112,6 +112,11 @@ if (( ${+commands[sheldon]} )); then
   unset sheldon_cache sheldon_toml sheldon_lock
 fi
 
+# Atuin shell history (self-hosted sync: atuin.jonnybarnes.uk)
+if (( ${+commands[atuin]} )); then
+  eval "$(atuin init zsh)"
+fi
+
 # Set the prompt
 # We need zsh git integration
 # Autoload zsh's `add-zsh-hook` and `vcs_info` functions