diff --git a/.config/oh-my-zsh/aliases.zsh b/.config/oh-my-zsh/aliases.zsh
index 6282826..c5ce10d 100644
--- a/.config/oh-my-zsh/aliases.zsh
+++ b/.config/oh-my-zsh/aliases.zsh
@@ -7,17 +7,6 @@ alias updatealias='source $HOME/.zshrc'
 ## https://www.atlassian.com/git/tutorials/dotfiles
 alias dotfiles='/usr/bin/git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 
-## ssh workaround for kitty terminal
-alias ssh='sshKittyWorkaround'
-
-function sshKittyWorkaround {
-	if [[ "$TERM" == "xterm-kitty" ]]; then
-		kitty +kitten ssh $argv;
-	else
-		"ssh" $argv;
-	fi
-}
-
 ## navigation
 alias ..='cd ..'
 alias ...='cd ../..'
diff --git a/.zshrc b/.zshrc
index 6be7a96..3a63f6c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -39,7 +39,6 @@ plugins=(
   history
   pass
   sudo
-  zsh-interactive-cd
   )
 
 source $ZSH/oh-my-zsh.sh
@@ -49,7 +48,8 @@ source $ZSH/oh-my-zsh.sh
 # You may need to manually set your language environment
 # export LANG=en_US.UTF-8
 
-export EDITOR=/usr/bin/vim
+export EDITOR=/usr/bin/nvim
+export VISUAL=/usr/bin/nvim
 export HISTORY_IGNORE="(ls|cd|pwd|exit|history|cd -|cd ..)"
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 
@@ -57,23 +57,5 @@ setopt completealiases
 
 prompt_context(){}
 
-## compdef kitty
-
-_kitty() {
-    local src
-    # Send all words up to the word the cursor is currently on
-    src=$(printf "%s
-" "${(@)words[1,$CURRENT]}" | kitty +complete zsh)
-    if [[ $? == 0 ]]; then
-        eval ${src}
-    fi
-}
-compdef _kitty kitty
-
-autoload -Uz compinit
-compinit
-# Completion for kitty
-kitty + complete setup zsh | source /dev/stdin
-
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh