diff --git a/bash/.bashrc b/bash/.bashrc
index 10a1bb9..f26df78 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -10,10 +10,8 @@
                                                             
 
 # Set some defaults.
-export EDITOR="emacsclient -t"
-export VISUAL="emacsclient -c -a emacs"
-export ALTERNATE_EDITOR=""
-export PATH=".:~/bin:~/.local/bin:~/.emacs.d/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+export EDITOR="nvim"
+export PATH=".:~/bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
 
 # XDG
@@ -202,12 +200,10 @@ alias nano='nano -ciw '
 alias tm="tmux new-session -A -s main"
 
 # always use nvim
-#alias vim='nvim'
-#alias vi='nvim'
-#alias nv='nvim'
+alias vim='nvim'
+alias vi='nvim'
+alias nv='nvim'
 
-# emacsclient
-alias ec="emacsclient -n -c -a emacs"
 
 if [[ HAS_GNOME ]]; then
     alias nosleep="gnome-session-inhibit --inhibit idle sleep infinity"
@@ -266,10 +262,6 @@ function mt {
     mosh $1 -- tmux new-session -A -s main
 }
 
-# emacs client function
-# function ec {
-#     emacsclient -c -a "emacs" $@ &
-# }