diff options
| author | David Thompson <dthompson@vistahigherlearning.com> | 2016-02-13 12:01:34 -0500 |
|---|---|---|
| committer | David Thompson <dthompson@vistahigherlearning.com> | 2016-02-13 12:07:38 -0500 |
| commit | 868f2d3989ea3cf9493a092bfb66e9260929002e (patch) | |
| tree | d4ca3ea3a7ee3c7ba83454f0b952602929be0530 /dotfiles/.emacs.d/init.el | |
| parent | b194ea647068342c3263357393e9c99ab04cf74a (diff) | |
Update emacs config.
Diffstat (limited to 'dotfiles/.emacs.d/init.el')
| -rw-r--r-- | dotfiles/.emacs.d/init.el | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el index ce10c3c..2acbaba 100644 --- a/dotfiles/.emacs.d/init.el +++ b/dotfiles/.emacs.d/init.el @@ -9,6 +9,10 @@ ;; Maximize frames (add-to-list 'default-frame-alist '(fullscreen . maximized)) +;; Stop customize from writing to my init file. Who thought this was +;; a good idea? +(setf custom-file "~/.emacs.d/custom.el") + (defmacro when-require (package &rest body) "Evaluate BODY if and only if PACKAGE can be imported." (declare (indent 1)) @@ -196,6 +200,7 @@ might be bad." (setf magit-default-tracking-name-function 'magit-default-tracking-name-branch-only) (setf magit-last-seen-setup-instructions "1.4.0") + (setf magit-completing-read-function #'magit-ido-completing-read) (global-set-key (kbd "C-c g") 'magit-status)) @@ -234,6 +239,7 @@ might be bad." ;;; (when-require 'web-mode + (add-hook 'web-mode-hook (lambda () (setq web-mode-markup-indent-offset 2))) (add-to-list 'auto-mode-alist '("\\.html$" . web-mode)) (add-to-list 'auto-mode-alist '("\\.tpl$" . web-mode)) (add-to-list 'auto-mode-alist '("\\.erb$" . web-mode))) @@ -334,7 +340,7 @@ indentation." (lisp-indent-specform method state indent-point normal-indent)) (method - (funcall method state indent-point normal-indent))))))) + (funcall method state indent-point normal-indent))))))) (defun connect-to-guile-wm () "Connect to guile-wm's REPL server." @@ -454,11 +460,10 @@ indentation." :query "tag:inbox" :sort-order newest-first) ,(unread-mail-by-tag "guile") - ,(recent-mail-by-tag "semaphore") - ,(recent-mail-by-tag "airbrake") - ,(recent-mail-by-tag "nagios") - ,(recent-mail-by-tag "newrelic") - ,(recent-mail-by-tag "rackspace"))) + ,@(mapcar 'recent-mail-by-tag + '("nagios" "semaphore" "airbrake" "newrelic" + "rackspace" "vividcortex" "aws" "papertrail" + "codeclimate" "basecamp")))) (define-key notmuch-search-mode-map "u" (lambda () |