diff --git a/configs/zsh/macros.sh b/configs/zsh/macros.sh
index 3969e84..c4d0acf 100644
--- a/configs/zsh/macros.sh
+++ b/configs/zsh/macros.sh
@@ -32,6 +32,10 @@ alias whois-radb="whois -h whois.radb.net"
 alias whois-reach="whois -h rr.telstraglobal.net"
 alias whois-ripe="whois -h whois.ripe.net"
 
+# Neo-aliases
+if [ -x "$(command -v nvim)" ]; then alias vim="nvim"; fi
+if [ -x "$(command -v neomutt)" ]; then alias mutt="neomutt"; fi
+
 # Kill via pgrep
 nkill() {
     if [ $# != 1 ]; then