refactor(shell): go back full terminal

After a long while in emacs gui trying the terminal inside emacs and using the
external terminal with tmux. I have now decided to back full terminal using
emacs in the terminal in a tmux pain, sort of the same way I was using vim
before I switched to emacs.

site-modules/core/files/zshrc

@@ -52,8 +52,6 @@ if [[ -z $INSIDE_EMACS ]] && [[ -z "$SSH_TTY" ]] ; then
     [ -n "$PS1" ] && \
         [ -s "$BASE16_SHELL/profile_helper.sh" ] && \
             eval "$("$BASE16_SHELL/profile_helper.sh")"
-
-    $HOME/.dotfiles/bin/base16_theme;
 fi
 
 #
@@ -86,7 +84,7 @@ fi
 #
 source $ZSH/oh-my-zsh.sh
 
-export EDITOR="emacs --no-wait"
+export EDITOR="emacsclient -nw"
 
 #
 # Import local alases if the file exists

site-modules/core/templates/git/gitconfig.erb

@@ -7,7 +7,7 @@
   name = <%= scope.call_function('lookup', ["user_name"]) %>
 
 [core]
-  editor = $ZSH/plugins/emacs/emacsclient.sh -nw
+  editor = $ZSH/plugins/emacs/emacsclient.sh
   autocrlf = input
 
 [rerere]