Move Circe settings to literate init

1 files changed, 2 insertions, 90 deletions

diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 3ef4a46..8b68969 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -236,13 +236,6 @@ But only if it is a maildir inbox."
   "Function for `diary-display-hook'."
   (diary-fancy-display))
 
-(defun oni:display-in-minibufferless-frame (buffer _)
-  (let ((default-frame-alist default-frame-alist))
-    (push '(minibuffer . nil) default-frame-alist)
-    (let ((frame (make-frame)))
-      (select-frame frame)
-      (switch-to-buffer buffer))))
-
 (defun oni:downcase-prev (num)
   (interactive "p")
   (oni:change-prev-case num 'down))
@@ -977,85 +970,7 @@ from myaethon2.core.decorators import (
            c-lineup-gnu-DEFUN-intro-cont))))
 
 (stante-after circe
-  (defvar oni:circe-longest-nick 0)
-  (make-variable-buffer-local 'oni:circe-longest-nick)
-
-  (defun oni:circe-prompt (&rest keywords)
-    (let* ((nick (plist-get keywords :nick))
-           (l (length nick)))
-      (when (> l oni:circe-longest-nick)
-        (setq oni:circe-longest-nick l)
-        (setq-local lui-fill-type (make-string (+ l 3) ?\ )))
-      (format "%s   %s" (s-pad-left oni:circe-longest-nick " " nick)
-              (plist-get keywords :body))))
-
-  (defun oni:circe-action-prompt (&rest keywords)
-    (format "%s   %s %s" (s-pad-left oni:circe-longest-nick " " "*")
-            (plist-get keywords :nick)
-            (plist-get keywords :body)))
-
-  (defun oni:circe-server-prompt (&rest keywords)
-    (format "%s   %s" (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :body)))
-
-  (defun oni:circe-server-join-in-channel (&rest keywords)
-    (format "%s   Join: %s (%s) joined %s"
-            (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :nick)
-            (plist-get keywords :userinfo)
-            (plist-get keywords :channel)))
-
-  (defun oni:circe-server-join (&rest keywords)
-    (format "%s   %s joined the channel"
-            (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :nick)))
-
-  (defun oni:circe-server-quit (&rest keywords)
-    (format "%s   %s quit IRC: %s"
-            (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :nick)
-            (plist-get keywords :reason)))
-
-  (defun oni:circe-server-quit-channel (&rest keywords)
-    (format "%s   %s left %s: %s"
-            (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :nick)
-            (plist-get keywords :channel)
-            (plist-get keywords :reason)))
-
-  (defun oni:circe-server-part (&rest keywords)
-    (format "%s   %s parted %s: %s"
-            (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :nick)
-            (plist-get keywords :channel)
-            (plist-get keywords :reason)))
-
-  (defun oni:circe-server-nick-change (&rest keywords)
-    (format "%s   %s is now known as %s"
-            (s-pad-left oni:circe-longest-nick " " "***")
-            (plist-get keywords :old-nick)
-            (plist-get keywords :new-nick)))
-
-  (setq circe-format-self-say #'oni:circe-prompt)
-  (setq circe-format-say #'oni:circe-prompt)
-  (setq circe-format-self-action #'oni:circe-action-prompt)
-  (setq circe-format-action #'oni:circe-action-prompt)
-  (setq circe-format-server-message #'oni:circe-server-prompt)
-  (setq circe-format-server-join-in-channel #'oni:circe-server-join-in-channel)
-  (setq circe-format-server-join #'oni:circe-server-join)
-  (setq circe-format-server-quit #'oni:circe-server-quit)
-  (setq circe-format-server-quit-channel #'oni:circe-server-quit-channel)
-  (setq circe-format-server-part #'oni:circe-server-part)
-  (setq circe-format-server-nick-change #'oni:circe-server-nick-change)
-  (setq circe-network-options
-        `(("Freenode"
-           :nick "ryuslash"
-           :channels ("#emacs" "#mowedline" "#ninthfloor"))))
-  (setq lui-time-stamp-position 'right-margin)
-  (setq lui-time-stamp-format "%H:%M")
-  (setq lui-fill-type 'variable)
-  (add-hook 'lui-mode-hook (lambda () (setq right-margin-width 5)))
-  (add-hook 'circe-channel-mode-hook (lambda () (setq mode-line-format nil))))
+  (require 'circe-init))
 
 (stante-after compile
   (setq compilation-scroll-output t))
@@ -1333,10 +1248,7 @@ from myaethon2.core.decorators import (
    '("^\\*Help\\*$" display-buffer-in-side-window))
   (add-to-list
    'display-buffer-alist
-   `(,(rx bol "*helm") display-buffer-in-side-window (side . right))
-
-   (add-to-list 'display-buffer-alist
-                '("^\#mowedline$" oni:display-in-minibufferless-frame))))
+   `(,(rx bol "*helm") display-buffer-in-side-window (side . right))))
 
 (stante-after woman
   (setq woman-fill-column 72))