diff options
Diffstat (limited to '.config/emacs')
-rw-r--r-- | .config/emacs/custom.el | 9 | ||||
-rw-r--r-- | .config/emacs/init.el | 19 |
2 files changed, 22 insertions, 6 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el index 26eb2ae..aca35b0 100644 --- a/.config/emacs/custom.el +++ b/.config/emacs/custom.el @@ -9,7 +9,16 @@ ("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(erc-nick "lukeshu") '(explicit-shell-file-name "/bin/bash") + '(global-whitespace-mode nil) + '(inhibit-startup-screen t) + '(mdmua-maildir "~/Maildir") + '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt))) + '(page-break-lines-char 45) + '(ruby-deep-arglist nil) + '(ruby-deep-indent-paren nil) + '(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8)))) '(scroll-bar-mode nil) + '(scss-compile-at-save nil) '(send-mail-function (quote smtpmail-send-it)) '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com") '(smtpmail-smtp-service 587) 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 |