diff --git a/bash/.bashrc b/bash/.bashrc
index 02a5087..fba4826 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -15,6 +15,9 @@ test -s ~/.alias && . ~/.alias || true
 export PATH=$PATH:/home/zpb/.local/bin
 export PATH=$PATH:/home/zpb/.emacs.d/bin
 
+export EDITOR=emacs -nw
+export VISUAL=emacs
+
 if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} ]]
 then
         exec fish
diff --git a/fish/config.fish b/fish/config.fish
index bcdde68..285e1a3 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,8 +1,8 @@
-alias ls='lsd'
-alias l='ls -l'
-alias la='ls -a'
-alias lla='ls -la'
-alias lt='ls --tree'
+alias ls='exa --icons'
+alias l='exa -l --icons'
+alias la='exa -a --icons'
+alias lla='exa -la --icons'
+alias lt='exa --tree --icons'
 
 zoxide init fish | source