Merge branch 'main' of tildegit.org:acdw/emacs

1 files changed, 17 insertions, 9 deletions

@@ -46,7 +46,7 @@
   (normal-top-level-add-subdirs-to-load-path))
 
 ;;;; Private stuff
-(require 'acdw-private)
+(acdw/require-private)
 
 
 ;;;; Utility functions and variables
@@ -259,24 +259,31 @@
    erc-button-url-regexp browse-url-button-regexp
    erc-common-server-suffixes '(("tilde.chat\\'" . "~")
                                 ("libera.chat\\'" . "LC"))
+   erc-default-server "irc.tilde.chat" ; fuck freenode. all my friends hate
+                                        ; freenode.
+   erc-fill-function #'erc-fill-static
+   erc-fill-static-center 14
    erc-header-line-face-method #'erc/update-header-line-show-disconnected
    erc-hide-list '("JOIN" "NICK" "PART" "QUIT" "MODE"
                    "324" "329" "332" "333" "353" "477")
    erc-interpret-controls-p t
    erc-interpret-mirc-color t
-   erc-join-buffer 'buffer
+   erc-join-buffer 'bury
    erc-kill-buffer-on-part t
    erc-kill-queries-on-quit t
    erc-kill-server-buffer-on-quit t
    erc-nick "acdw"
-   erc-prompt (lambda () (concat (buffer-name) ">"))
+   erc-prompt (lambda () (acdw-erc/prompt))
    erc-prompt-for-password nil ; use ~/.authinfo
    erc/servers
    (when (boundp 'erc-autojoin-channels-alist)
      (mapcar #'car erc-autojoin-channels-alist))
    erc-server-coding-system '(utf-8 . utf-8)
    erc-track-exclude-types erc-hide-list
-   erc-track-position-in-mode-line 'before-modes)
+   erc-track-exclude-server-buffer t
+   erc-track-position-in-mode-line 'before-modes
+   erc-track-visibility nil ; only the selected frame
+   )
 
   ;; Thanks bpalmer!
   (advice-add 'show-paren-function :around
@@ -289,11 +296,12 @@
              erc-track-mode
              erc-truncate-mode)
 
-  (setup (:straight erc-hl-nicks)
-    (with-eval-after-load 'erc
-      (require 'erc-hl-nicks)
-      (:option erc-hl-nicks-minimum-contrast-ratio 4.5)
-      (:hook-into erc-mode))))
+  ;; (setup (:straight erc-hl-nicks)
+  ;;   (with-eval-after-load 'erc
+  ;;     (require 'erc-hl-nicks)
+  ;;     (:option erc-hl-nicks-minimum-contrast-ratio 4.5)
+  ;;     (:hook-into erc-mode)))
+  )
 
 (setup eshell
   (:also-load acdw-eshell