1 files changed, 9 insertions, 10 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 573ef3d..d450177 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -59,10 +59,8 @@
  '(dired-omit-files "^\\.?#\\|^\\.$\\|^\\.\\.\\|^\\..*$")
  '(diredp-hide-details-initially-flag t)
  '(diredp-wrap-around-flag nil)
- '(erc-insert-timestamp-function (quote erc-insert-timestamp-left))
  '(erc-mode-line-format "%t")
  '(erc-prompt ">")
- '(erc-timestamp-format "%a %H:%M ")
  '(fill-column 79)
  '(font-lock-maximum-decoration t)
  '(frame-background-mode (quote dark))
@@ -120,13 +118,14 @@
  '(diredp-read-priv ((t (:foreground "gray70"))))
  '(diredp-symlink ((t (:foreground "#32E2E2"))))
  '(diredp-write-priv ((t (:foreground "gray90"))))
- '(erc-current-nick-face ((t (:foreground "#B58900" :weight bold))))
- '(erc-input-face ((t (:foreground "gray90"))))
- '(erc-my-nick-face ((t (:foreground "#B58900" :weight bold))))
- '(erc-nick-default-face ((t (:foreground "#B58900"))))
- '(erc-notice-face ((t (:foreground "gray40"))))
- '(erc-prompt-face ((t (:foreground "green" :weight bold))))
- '(erc-timestamp-face ((t (:foreground "gray60"))))
+ '(erc-action-face ((t (:slant italic))))
+ '(erc-current-nick-face ((t (:foreground "#2AA198" :weight bold))))
+ '(erc-input-face ((t (:foreground "#CB4B16"))))
+ '(erc-my-nick-face ((t (:foreground "#CB4B16" :weight bold))))
+ '(erc-nick-default-face ((t (:foreground "#A3B1B1"))))
+ '(erc-notice-face ((t (:foreground "#6C71C4"))))
+ '(erc-prompt-face ((t (:foreground "white" :weight bold))))
+ '(erc-timestamp-face ((t (:foreground "#859900"))))
  '(error ((t (:foreground "#DC322F" :weight bold))))
  '(escape-glyph ((((background dark)) (:foreground "cyan"))))
  '(font-lock-comment-face ((t (:foreground "#6c71c4"))))
@@ -338,7 +337,7 @@
 (when (require 'erc nil :noerror)
   (erc-autojoin-mode t)
   (setq erc-autojoin-channels-alist
-        '((".*\\.freenode.net" "#ardour" "#ardour-dev" "#ardour-mixbus-dev" "#ingen" "#lv2" "#moddevices")))
+        '((".*\\.freenode.net" "#ardour" "#ardour-dev" "#ardour-mixbus-dev" "#ingen" "#lv2" "#moddevices" "#lad")))
 
   (erc-track-mode t)
   (setq erc-track-exclude-types '("JOIN" "NICK" "PART" "QUIT" "MODE"