use authinfo for authentication

diff --git a/emacs/my-erc.el b/emacs/my-erc.el
index 53718da29155b34e8057a2076e7fb45b6911e767..8a52889d6a1e6e876b59411d472568915aa5e227 100644 (file)
--- a/emacs/my-erc.el
+++ b/emacs/my-erc.el
@@ -3,7 +3,7 @@
 
 ;; Load authentication info from an external source.  Put sensitive
 ;; passwords and the like in here.
-(load "~/.emacs.d/emacs/.erc-auth")
+;;; (load "~/.emacs.d/emacs/.erc-auth")
 
 (require 'erc-services)
 (require 'erc-match)
@@ -11,12 +11,12 @@
 
 (setq erc-prompt-for-nickserv-password nil)
 
-(setq erc-nickserv-passwords
-      `((freenode     (("vu3rdd" . ,freenode-nick-pass)))
-       (debian       (("vu3rdd" . ,debian-nick-pass)))))
+;; (setq erc-nickserv-passwords
+;;       `((freenode     (("vu3rdd" . ,freenode-nick-pass)))
+;;     (debian       (("vu3rdd" . ,debian-nick-pass)))))
 
 (setq erc-autojoin-channels-alist
-      '((".*\\.freenode.net" "#racket" "#haskell")
+      '((".*\\.freenode.net" "#racket" "#notmuch")
        (".*\\.oftc.net" "#debian-arm" "#debian" "#debian-devel")))
 
 (global-set-key "\C-cef" (lambda () (interactive)