diff options
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r-- | .config/emacs/init.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index f570a1a..ee77250 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -41,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 80 :foundry "unknown" :family "DejaVu Sans Mono") ;;;; Bootstrap el-get ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -77,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) @@ -117,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 @@ -216,6 +218,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 |