diff --git a/.gitignore b/.gitignore index 0b5311d..13a372e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ auto-save-list/ eln-cache/ etc/ +feeds.txt gnus/ pkg/ private.el diff --git a/gnus.el b/gnus.el index 8c06855..d179937 100644 --- a/gnus.el +++ b/gnus.el @@ -16,22 +16,25 @@ ;;; Code: +;;; Private files +(require 'acdw-private) + ;;; Select Methods (setq gnus-select-method '(nnnil "")) -(setq gnus-secondary-select-methods - '((nnimap "fastmail.com" - (nnimap-address "imap.fastmail.com") - (nnimap-server-port 993) - (nnimap-stream ssl) - (nnir-search-engine imap)) - (nntp "news.tilde.club") - (nntp "news.gwene.org") - (nntp "news.gmane.io"))) +(add-hook 'gnus-startup-hook + (defun gnus-startup@feed-setup () + (cond ((fboundp #'gnus/init-feed-list) + (gnus/init-feed-list)) + ((and (fboundp #'gnus/import-feed-list) + (file-exists-p (expand-file-name + "feeds.txt" user-emacs-directory))) + (gnus/import-feed-list (expand-file-name + "feeds.txt" user-emacs-directory))) + (t (message "Oops, no feeds :/"))))) ;;; Gnus cloud -(setq gnus-cloud-method "nnimap:fastmail.com" - gnus-cloud-storage-method nil ; Don't always have GPG or gzip +(setq gnus-cloud-storage-method nil ; Don't always have GPG or gzip gnus-cloud-covered-servers '("nntp:news.tilde.club" "nntp:news.gwene.org" "nntp:news.gmane.io")) @@ -61,7 +64,7 @@ ;;; Other parameters (setq gnus-parameters - '(("nnimap\\+fastmail.com:.*" + '(("fastmail.com:.*" (display . 200) (expiry-wait . immediate) (expiry-target . "nnimap+fastmail.com:Archive")))) @@ -116,16 +119,6 @@ (flyspell-mode +1) (local-set-key (kbd "TAB") #'bbdb-complete-mail))) -;;; Sending mail -(setq send-mail-function #'smtpmail-send-it - message-send-mail-function #'smtpmail-send-it - smtpmail-smtp-server "smtp.fastmail.com" - smtpmail-default-smtp-server "smtp.fastmail.com" - smtpmail-smtp-service 465 - smtpmail-stream-type 'ssl - smtpmail-smtp-user "acdw@fastmail.com" - message-kill-buffer-on-exit t) - ;;; Packages ;; searching (?) diff --git a/groups.txt b/groups.txt deleted file mode 100644 index f6a370c..0000000 --- a/groups.txt +++ /dev/null @@ -1,81 +0,0 @@ -nntp+news.gmane.io:gmane.emacs.announce -nntp+news.gmane.io:gmane.emacs.erc.announce -nntp+news.gmane.io:gmane.emacs.gnus.announce -nntp+news.gmane.io:gmane.emacs.humanities -nntp+news.gmane.io:gmane.network.protocols.gemini -nntp+news.gwene.org:gwene.blog.botanistinthek -nntp+news.gwene.org:gwene.ca.muto -nntp+news.gwene.org:gwene.casa.m455 -nntp+news.gwene.org:gwene.casa.m455.weed.weed -nntp+news.gwene.org:gwene.codes.esoteric -nntp+news.gwene.org:gwene.com.aiweirdness -nntp+news.gwene.org:gwene.com.ajroach42 -nntp+news.gwene.org:gwene.com.careercenterbr -nntp+news.gwene.org:gwene.com.catandgirl -nntp+news.gwene.org:gwene.com.deprogrammatic -nntp+news.gwene.org:gwene.com.drewdevault.blog -nntp+news.gwene.org:gwene.com.ebrpl.blog -nntp+news.gwene.org:gwene.com.emacslife.planet -nntp+news.gwene.org:gwene.com.falseknees -nntp+news.gwene.org:gwene.com.gerwitz.hans.feeds.writing -nntp+news.gwene.org:gwene.com.greghendershot -nntp+news.gwene.org:gwene.com.invisibleup -nntp+news.gwene.org:gwene.com.lambdacreate.static -nntp+news.gwene.org:gwene.com.murilopereira -nntp+news.gwene.org:gwene.com.occasionallyco -nntp+news.gwene.org:gwene.com.rachelbythebay.w -nntp+news.gwene.org:gwene.com.realbakingwith.month -nntp+news.gwene.org:gwene.com.usesthis -nntp+news.gwene.org:gwene.com.wflewis -nntp+news.gwene.org:gwene.com.whyarentyoucod -nntp+news.gwene.org:gwene.com.wordpress.filledwithcrea -nntp+news.gwene.org:gwene.com.xkcd -nntp+news.gwene.org:gwene.dance.hamster.blog -nntp+news.gwene.org:gwene.de.uninformativ.blog.feeds.en -nntp+news.gwene.org:gwene.info.benjaminwil.antisocial -nntp+news.gwene.org:gwene.io.github.chrisman -nntp+news.gwene.org:gwene.io.github.wphicks -nntp+news.gwene.org:gwene.io.jao.blog -nntp+news.gwene.org:gwene.io.wpc.blog -nntp+news.gwene.org:gwene.li.eli -nntp+news.gwene.org:gwene.link.atthis -nntp+news.gwene.org:gwene.name.spwhitton.blog -nntp+news.gwene.org:gwene.net.acdw -nntp+news.gwene.org:gwene.net.acdw.feed.weed -nntp+news.gwene.org:gwene.net.envs.lucidiot.rsrsss -nntp+news.gwene.org:gwene.net.neeasade.notes.rss.full -nntp+news.gwene.org:gwene.net.ryliejamesthom.blog -nntp+news.gwene.org:gwene.news.tilde.rss.token.fvd.fj8r.qkhr.by9j1y.on1t6rykddc -nntp+news.gwene.org:gwene.nz.geek.sanctum.blog -nntp+news.gwene.org:gwene.org.eu.pt.astrosnail.blog -nntp+news.gwene.org:gwene.org.lisp.planet.rss20 -nntp+news.gwene.org:gwene.org.neocities.society -nntp+news.gwene.org:gwene.org.neocities.supervegan -nntp+news.gwene.org:gwene.org.scheme.planet -nntp+news.gwene.org:gwene.org.z3bra.blog -nntp+news.gwene.org:gwene.rip.computer -nntp+news.gwene.org:gwene.space.makeworld -nntp+news.gwene.org:gwene.space.petras -nntp+news.gwene.org:gwene.team.tilde.dozens.dreams -nntp+news.gwene.org:gwene.town.tilde.dozens.rsspect -nntp+news.gwene.org:gwene.town.tilde.lucidiot.fridaypostcard -nntp+news.gwene.org:gwene.town.tilde.lucidiot.weed.weed -nntp+news.gwene.org:gwene.town.tilde.m455.javapool -nntp+news.gwene.org:gwene.town.tilde.mroik.blog -nntp+news.gwene.org:gwene.town.tilde.trm.blog -nntp+news.gwene.org:gwene.uk.co.gaffen -nntp+news.gwene.org:gwene.uk.me.insom -nntp+news.gwene.org:gwene.voyage.cosmic -nntp+news.gwene.org:gwene.website.coolguy.weed.weed -nntp+news.gwene.org:gwene.xyz.earnestma.blog -nntp+news.gwene.org:gwene.xyz.jackreid -nntp+news.tilde.club:local.general -nntp+news.tilde.club:tilde.art -nntp+news.tilde.club:tilde.club -nntp+news.tilde.club:tilde.cosmic -nntp+news.tilde.club:tilde.food+drink -nntp+news.tilde.club:tilde.gopher -nntp+news.tilde.club:tilde.meta -nntp+news.tilde.club:tilde.poetry -nntp+news.tilde.club:tilde.services -nntp+news:gwene.com.xenodium diff --git a/init.el b/init.el index fc5927e..aaa73f6 100644 --- a/init.el +++ b/init.el @@ -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)