1 files changed, 13 insertions, 6 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index fabe70e..e69a9ec 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -1,4 +1,5 @@
-;; This config requires Emacs 24(+?)
+;; This config requires Emacs 24.4(+?)
+;; Without (add-advice) it should work in older versions of Emacs 24.
 ;;;; Use XDG-ish locations ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (setq xdg-cache-home (file-name-as-directory (or (getenv "XDG_CACHE_HOME") "~/.cache")))
 (setq
@@ -40,7 +41,8 @@
 ;;;; Early settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; This isn't particularly important, but set it before doing a whole
 ;; lot (loading packages), so there isn't a weird change in text size.
-(set-face-attribute 'default nil :height 80)
+(setq notify-method 'notify-via-libnotify)
+(set-face-attribute 'default nil :height 93)
 
 
 ;;;; Bootstrap el-get ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -76,7 +78,8 @@
 ;; This is also nice because I can do event-base programming for what
 ;; to do once a package is loaded, using :after.
 
-(add-to-list 'package-archives '("melpa" . "http://melpa.milkbox.net/packages/"))
+(add-to-list 'package-archives '("ELPA" . "http://tromey.com/elpa/"))
+(add-to-list 'package-archives '("marmalade" . "http://marmalade-repo.org/packages/"))
 (setq package-enable-at-startup nil)
 
 ;; What packages el-get should get from ELPA (if it gets them at all)
@@ -116,7 +119,7 @@
   smart-tabs-mode
   page-break-lines
   ;; Major modes
-  apel flim semi wanderlust
+  ;;apel flim semi wanderlust
   graphviz-dot-mode
   markdown-mode
   nginx-mode
@@ -133,7 +136,7 @@
   "Use spaces for alignment"
   (let ((indent-tabs-mode nil))
     (apply orig-fun args)))
-(advice-add 'align-regexp :around #'align-regexp--use-spaces)
+;(advice-add 'align-regexp :around #'align-regexp--use-spaces)
 
 (defun sh-smie-sh-rules--fix (args)
   "Replace :after \"then\" with :after \"if\" because Emacs 24
@@ -141,7 +144,7 @@ sh-script.el is broken."
   (if (equal args (list :after "then"))
       (list :after "if")
     args))
-(advice-add 'sh-smie-sh-rules :filter-args #'sh-smie-sh-rules--fix)
+;(advice-add 'sh-smie-sh-rules :filter-args #'sh-smie-sh-rules--fix)
 
 (require 'go-mode-load nil t)
 
@@ -213,6 +216,10 @@ sh-script.el is broken."
  ediff-split-window-function 'split-window-horizontally
  )
 
+(set-default 'truncate-lines t)
+(setq inhibit-startup-screen t
+      server-use-tcp t)
+
 ;; Automatically load smerge mode for merge files
 (defun try-smerge-mode ()
   (save-excursion