diff --git a/emacs/.spacemacs b/emacs/.spacemacs
index 4979c93..f8562f1 100644
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -51,7 +51,8 @@ This function should only modify configuration layer settings."
      ;; org
      (shell :variables
              shell-default-height 30
-             shell-default-position 'bottom)
+             shell-default-position 'bottom
+             shell-default-shell 'eshell)
      ;; spell-checking
      syntax-checking
      ;; version-control
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index ec310f3..46168f7 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -21,22 +21,16 @@ function fish_title
   true
 end
 
-# Spacemacs
-if test -n "$EMACS"
-  set -x TERM eterm-color
-end
+# Compiler
+export CC=/usr/local/bin/clang80
+export CXX=/usr/local/bin/clang++80
 
 # fff
 ## Directory color [0-9]
 export FFF_COL1=3
 export FFF_COL2=8
-
 ## Favourites (keys 1-9) (dir or file)
 export FFF_FAV1=/home/coolneng/Nextcloud/Documents/Archive-uni/Second\ year/
 export FFF_FAV2=/home/coolneng/Nextcloud/Documents/Papers
 export FFF_FAV3=/home/coolneng/Nextcloud/Documents/Books/Academic/
 export FFF_FAV4=/home/coolneng/Nextcloud/Documents/Extracurricular/
-
-## Compiler
-export CC=/usr/local/bin/clang80
-export CXX=/usr/local/bin/clang++80