diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 66b1f2e..f25a20e 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -34,14 +34,10 @@ if status is-interactive
     set -x EDITOR /usr/bin/nvim
 
     # Setup
-    ## McFly
-    set -gx MCFLY_KEY_SCHEME vim
-    set -gx MCFLY_FUZZY 1
-    set -gx MCFLY_RESULTS 25
-    set -gx MCFLY_INTERFACE_VIEW BOTTOM
-    set -gx MCFLY_RESULTS_SORT LAST_RUN
-    set -gx MCFLY_HISTORY_LIMIT 10000
-    mcfly init fish | source
+    ## Atuin
+    set -gx ATUIN_NOBIND true
+    atuin init fish | source
+    bind \cr _atuin_search
 
     # Abbreviations
     ## Replacements