diff options
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index fabe70e..08b356f 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -40,7 +40,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 +77,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) @@ -213,6 +215,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 |