Merge in epsilon configs

emacs/init.el

@@ -98,7 +98,7 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(tuareg-font-lock-operator-face ((t (:inherit font-lock-keyword-face)))))
+ )
 
 (require 'autopair)
 (autopair-global-mode)
@@ -283,10 +283,3 @@ they line up with the line containing the corresponding opening bracket."
 (add-to-list 'custom-theme-load-path "~/.emacs.d/themes")
 (load-theme 'jdkaplan t)
 ;; (load-theme 'jdkaplan-light t)
-
-;; sup
-(add-to-list 'auto-mode-alist '("/sup.*eml$" . message-mode))
-(add-hook 'message-mode-hook
-          (lambda ()
-            (auto-fill-mode 1)
-            (search-forward-regexp "^$")))

zsh/aliases

@@ -8,11 +8,10 @@ alias ll='ls -l'
 alias units='units --verbose'
 alias trr='transmission-remote'
 
-
 alias vol='pulseaudio-ctl set'
 
 alias ssh-add-all='for key in ~/.ssh/id_rsa^*.pub; do ssh-add $key; done'
 
 which thefuck > /dev/null && eval $(thefuck --alias)
 
-alias todo='todo.sh'
+alias shutdown='sudo shutdown now'