diff --git a/.bashrc b/.bashrc
index b8ebcf5..b4f2338 100644
--- a/.bashrc
+++ b/.bashrc
@@ -7,7 +7,7 @@
 # My bash config. Not much to see here.  Some pretty standard stuff.
 
 PATH="$HOME/.local/bin${PATH:+:${PATH}}"
-EDITOR="vim"
+EDITOR="nvim"
 export TERM="st"
 
 [[ $- != *i* ]] && return
@@ -148,6 +148,9 @@ alias doas="doas --"
 alias	..='cd ..' \
 		...='cd ../..'
 
+# vim
+alias vim=nvim
+
 # broot
 alias br='br -dhp'
 alias bs='br --sizes'
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index d80e892..37d657b 100755
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -110,7 +110,7 @@ local filemanager       = "thunar"
 local mailclient        = "geary"
 local mediaplayer       = "vlc"
 local scrlocker         = "slimlock"
-local terminal          = "alacritty"
+local terminal          = "st"
 local virtualmachine    = "virtualbox"
 
 -- awesome variables
diff --git a/.dmenu/dmenu-edit-configs.sh b/.dmenu/dmenu-edit-configs.sh
index b1b43c5..3ef8455 100755
--- a/.dmenu/dmenu-edit-configs.sh
+++ b/.dmenu/dmenu-edit-configs.sh
@@ -120,4 +120,4 @@ case "$choice" in
 		exit 1
 	;;
 esac
-st -e vim "$choice"
+st -e nvim "$choice"