add irc.mozilla.org.. other haskell mode changes

diff --git a/init.el b/init.el
index 983217e07584f2f484d972c3f4ecf7daac016249..12b1e81397d9ed0827aaf622b42e88dfe00b841f 100644 (file)
--- a/init.el
+++ b/init.el
@@ -82,13 +82,13 @@
 
 (erc-autojoin-mode t)
 (setq erc-autojoin-channels-alist
-  '((".*\\.freenode.net" "#tahoe-lafs" "#plan9chan" "#cat-v")
-    (".*\\.oftc.net" "#LeastAuthority")))
+  '((".*\\.freenode.net" "#tahoe-lafs")
+    (".*\\.oftc.net" "#LeastAuthority")
+    (".*\\.mozilla.org" "#rust-beginners")))
 
 ;; check channels
 (erc-track-mode t)
 (setq erc-track-exclude-types '("JOIN" "NICK" "PART" "QUIT" "MODE"
-
                                  "324" "329" "332" "333" "353" "477"))
 ;; don't show any of this
 (setq erc-hide-list '("JOIN" "PART" "QUIT" "NICK"))
@@ -97,6 +97,7 @@
   "Connect to IRC."
   (interactive)
   (when (y-or-n-p "Do you want to start IRC? ")
+    (erc-tls :server "irc.mozilla.org" :port 6697 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")
     (erc-tls :server "irc.freenode.net" :port 6697 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")
     (erc-tls :server "irc.oftc.net" :port 6697 :nick "rkrishnan" :full-name "Ramakrishnan Muthukrishnan")))
 
@@ -107,10 +108,6 @@
 (setenv "PATH" (concat "~/.cabal/bin:" (getenv "PATH")))
 (add-to-list 'exec-path "~/.cabal/bin")
 (add-hook 'haskell-mode-hook 'turn-on-haskell-doc-mode)
-;; (add-hook 'haskell-mode-hook 'haskell-indent-mode)
-;; (add-hook 'haskell-mode-hook 'interactive-haskell-mode)
-;(add-hook 'haskell-mode-hook 'turn-on-haskell-indent)
-;(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
 
 ;; haskell mode
 (require 'haskell-interactive-mode)
@@ -242,3 +239,16 @@
   (add-hook 'before-save-hook 'gofmt-before-save))
 
 (add-hook 'go-mode-hook 'go-mode-setup)
+
+;; alias man to w.o.man
+(defalias 'man 'woman)
+
+;; eshell aliases
+(defun eshell/emacs (&rest args)
+  "open a file in emacs"
+  (if (null args)
+      (bury-buffer)
+    (mapc #'find-file (mapcar #'expand-file-name (eshell-flatten-list (reverse args))))))
+
+;(desktop-save-mode 1)
+