Update emacs config.

2 files changed, 20 insertions, 7 deletions

diff --git a/dotfiles/.emacs.d/erc.el b/dotfiles/.emacs.d/erc.el
index 9597835..c0a2274 100644
--- a/dotfiles/.emacs.d/erc.el
+++ b/dotfiles/.emacs.d/erc.el
@@ -73,7 +73,7 @@
 (erc-autojoin-mode t)
 (setq erc-autojoin-channels-alist
       '(("freenode.net" "#guile" "#guix" "#emacs" "#scheme"
-         "#lispgames" "#fsf" "#gnu" "##wizards" "#sly")
+         "#lispgames" "#fsf" "#gnu" "#sly")
         ("slack.com" "#general" "#random" "#ops" "#techeng"
          "#church-of-emacs")))
 
@@ -101,6 +101,14 @@
            :nick erc-nick
            :password freenode-password))
 
+(defun start-oftc ()
+  "Connect to OFTC IRC."
+  (interactive)
+  (erc-tls :server "irc.oftc.net"
+           :port 6697
+           :nick erc-nick
+           :password oftc-password))
+
 (defun start-slack ()
   "Connect to Slack."
   (interactive)
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 ()