1 files changed, 5 insertions, 15 deletions

@@ -45,6 +45,9 @@
              (expand-file-name-exists-p "pkg/" user-emacs-directory)))
   (normal-top-level-add-subdirs-to-load-path))
 
+;;;; Private stuff
+(require 'acdw-private)
+
 
 ;;;; Utility functions and variables
 ;; see also: `acdw' and friends.  Functions here aren't big enough, or they're
@@ -66,10 +69,7 @@
 
 (setup acdw
   (:option user-full-name "Case Duckworth"
-           user-mail-address "acdw@acdw.net"
-           calendar-location-name "Baton Rouge, LA"
-           calendar-latitude 30.4
-           calendar-longitude -91.1))
+           user-mail-address "acdw@acdw.net"))
 
 (setup (:require auth-source)
   (:option auth-sources '("~/.authinfo" "~/.authinfo.gpg")))
@@ -259,15 +259,6 @@
    erc-auto-discard-away t
    erc-autoaway-idle-seconds 600
    erc-autoaway-message "BRB (autoaway: %i seconds)"
-   erc-autojoin-channels-alist '(("libera.chat"
-                                  "#emacs" "##webpals"
-                                  "#erc")
-                                 ("tilde.chat"
-                                  "#meta" "#team" "#gemini"
-                                  "#bread" ; how could I've forgotten!?
-                                  "#politics" "#bungame"
-                                  "#dadjokes" "#tilderadio"
-                                  "#tilderadio-djs"))
    erc-button-url-regexp browse-url-button-regexp
    erc-common-server-suffixes '(("tilde.chat\\'" . "~")
                                 ("libera.chat\\'" . "LC"))
@@ -283,8 +274,7 @@
    erc-nick "acdw"
    erc-prompt (lambda () (concat (buffer-name) ">"))
    erc-prompt-for-password nil ; use ~/.authinfo
-   erc/servers '("irc.libera.chat"
-                 "irc.tilde.chat")
+   erc/servers (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)