Merge remote-tracking branch 'origin/master' into spacemacs

tmux.conf

@@ -1,22 +1,8 @@
-# color
-set -g default-terminal "xterm-256color"
-set-option -g default-shell /usr/local/bin/zsh
-set-option -g status-keys emacs
-set-option -g status on
-set-option -g status-interval 2
-set-option -g status-left-length 60
-set-option -g status-right-length 90
-set-option -g renumber-windows on
-
 # List of plugins
 # Supports `github_username/repo` or full git repo URLs
 set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
-
-# Plugin settings
-set -g @continuum-restore 'on'
-set -g status-right 'Continuum: #{continuum_status}'
 
 # Initializes TMUX plugin manager.
 # Keep this line at the very bottom of tmux.conf.

zshrc

@@ -33,6 +33,7 @@ hash -d src=~/src
 # Setup custom aliases
 alias up="vagrant up && vagrant ssh"
 alias stayawake="caffeinate -s -d -i"
+alias emacs="emacs -nw"
 
 ### Added by the Heroku Toolbelt
 export PATH="/usr/local/heroku/bin:$PATH"