diff --git a/.zimrc b/.zimrc
index 752bb8e..fdcf8ef 100644
--- a/.zimrc
+++ b/.zimrc
@@ -7,7 +7,6 @@ zmodule crater2150-zsh/chroma-z
 zmodule $ZDOTDIR/plugins/tmpsrc
 zmodule $ZDOTDIR/plugins/pyenv
 zmodule $ZDOTDIR/plugins/cs-java-home
-zmodule $ZDOTDIR/plugins/atuin
 
 zmodule $ZDOTDIR/plugins/highlight-config
 zmodule zsh-users/zsh-syntax-highlighting
@@ -15,4 +14,3 @@ zmodule zsh-users/zsh-syntax-highlighting
 zmodule ohmyzsh/ohmyzsh --root plugins/ng --fpath ./
 
 zmodule carlosedp/mill-zsh-completions
-zmodule zsh-users/zsh-autosuggestions
diff --git a/bindings.zsh b/bindings.zsh
index 2689f19..2726458 100644
--- a/bindings.zsh
+++ b/bindings.zsh
@@ -98,17 +98,11 @@ bindkey "\ev" zle-venv
 
 # Map widgets to key
 bindkey "\ec" fzf-change-directory
+bindkey "^r"  fzf-insert-history
 bindkey "^xf" fzf-insert-files
 bindkey "^xd" fzf-insert-directory
 bindkey "^xn" fzf-insert-named-directory
 
-if [[ $+commands[atuin] == 1 ]]; then
-	bindkey -M viins '^r' atuin-search-viins
-	bindkey -M vicmd '/' atuin-search
-else
-	bindkey "^r"  fzf-insert-history
-fi
-
 FZF_CHANGE_DIR_FIND_COMMAND="fd -t d"
 FZF_INSERT_DIR_COMMAND="fd -t d"
 FZF_INSERT_FILES_COMMAND="fd -t f"
diff --git a/confs b/confs
index 315910a..a6c81a0 100755
--- a/confs
+++ b/confs
@@ -19,4 +19,3 @@ xd                    $XDG_CONFIG_HOME/xd.conf
 zsh                   $ZDOTDIR
 kitty                 $XDG_CONFIG_HOME/kitty/kitty.conf
 kitty-sessions        $XDG_CONFIG_HOME/kitty/sessions
-atuin                 $XDG_CONFIG_HOME/atuin/config.toml
diff --git a/plugins/atuin/atuin.plugin.zsh b/plugins/atuin/atuin.plugin.zsh
deleted file mode 100644
index c2b4a07..0000000
--- a/plugins/atuin/atuin.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-local FOUND_ATUIN=$+commands[atuin]
-
-if [[ $FOUND_ATUIN -eq 1 ]]; then
-  source <(atuin init zsh --disable-up-arrow)
-fi
diff --git a/zshrc b/zshrc
index ce22276..f05b987 100644
--- a/zshrc
+++ b/zshrc
@@ -102,8 +102,8 @@ exists thefuck && eval $(thefuck --alias)
 
 if [[ -e $HOME/.calendars ]]; then
     _prompt_todos() {
-	local todos=( ${(u)$( rg -l '^STATUS:NEEDS-ACTION' $HOME/.calendars ):t} )
-	[[ $#todos -gt 0 ]] && echo "Todos: $#todos"
+	local todos=$(rg -l '^STATUS:NEEDS-ACTION' $HOME/.calendars | wc -l)
+	[[ $todos -gt 0 ]] && echo "Todos: $todos"
     }
     __chromaz_extra_left+=_prompt_todos
 fi