summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/isync/mbsyncrc41
-rw-r--r--.config/jami.net/Jami.conf4
-rw-r--r--.emacs.d/etc/eshell/aliases2
-rw-r--r--.emacs.d/lisp/bandali-gnus.el22
-rw-r--r--.gnupg/gpg-agent.conf1
5 files changed, 59 insertions, 11 deletions
diff --git a/.config/isync/mbsyncrc b/.config/isync/mbsyncrc
index 060f4d9..42c056c 100644
--- a/.config/isync/mbsyncrc
+++ b/.config/isync/mbsyncrc
@@ -4,10 +4,35 @@ Create Both
Expunge Both
######
+IMAPAccount kelar
+Host mail.kelar.org
+User bandali
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/kelar.gpg"
+SSLType IMAPS
+
+IMAPStore kelar-remote
+Account kelar
+
+IMAPAccount kelar-local
+Host 127.0.0.1
+Port 143
+User bandali@kelar.local
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/kelar-local.gpg"
+SSLType None
+
+IMAPStore kelar-local
+Account kelar-local
+
+Channel kelar
+Master :kelar-remote:
+Slave :kelar-local:
+Patterns *
+
+######
IMAPAccount shemshak
Host mail.shemshak.org
User bandali@shemshak.org
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/shemshak.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/shemshak.gpg"
SSLType IMAPS
IMAPStore shemshak-remote
@@ -17,7 +42,7 @@ IMAPAccount shemshak-local
Host 127.0.0.1
Port 143
User bandali@shemshak.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/shemshak-local.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/shemshak-local.gpg"
SSLType None
IMAPStore shemshak-local
@@ -32,7 +57,7 @@ Patterns *
IMAPAccount gnub
Host mail.shemshak.org
User gnu@bndl.org
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/gnub.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub.gpg"
SSLType IMAPS
Timeout 120
@@ -43,7 +68,7 @@ IMAPAccount gnub-local
Host 127.0.0.1
Port 143
User bandali@gnu.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/gnub-local.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/gnub-local.gpg"
SSLType None
IMAPStore gnub-local
@@ -58,7 +83,7 @@ Patterns *
IMAPAccount uwaterloo
Host connect.uwaterloo.ca
User abandali
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/uwaterloo.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/uwaterloo.gpg"
SSLType IMAPS
IMAPStore uwaterloo-remote
@@ -68,7 +93,7 @@ IMAPAccount uwaterloo-local
Host 127.0.0.1
Port 143
User abandali@uwaterloo.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/uwaterloo-local.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/uwaterloo-local.gpg"
SSLType None
IMAPStore uwaterloo-local
@@ -83,7 +108,7 @@ Patterns *
IMAPAccount csclub
Host mail.csclub.uwaterloo.ca
User abandali
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/csclub.gpg"
SSLType IMAPS
IMAPStore csclub-remote
@@ -93,7 +118,7 @@ IMAPAccount csclub-local
Host 127.0.0.1
Port 143
User abandali@csclub.uwaterloo.local
-PassCmd "gpg -q --for-your-eyes-only --no-tty -d ~/.passwd/csclub-local.gpg"
+PassCmd "gpg -q --for-your-eyes-only -d ~/.passwd/csclub-local.gpg"
SSLType None
IMAPStore csclub-local
diff --git a/.config/jami.net/Jami.conf b/.config/jami.net/Jami.conf
index 9c9899b..9884966 100644
--- a/.config/jami.net/Jami.conf
+++ b/.config/jami.net/Jami.conf
@@ -16,5 +16,5 @@ MinimizeOnClose=true
NeverShowMeAgain=false
ShowChatviewHorizontally=true
StartMinimized=false
-WindowGeometry=@Variant(\0\0\0\x14@\x10\0\0\0\0\0\0@4\0\0\0\0\0\0@\x9d\xe0\0\0\0\0\0@\x90(\0\0\0\0\0)
-WindowState=2
+WindowGeometry=@Variant(\0\0\0\x14\x7f\xf8\0\0\0\0\0\0\x7f\xf8\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0)
+WindowState=1
diff --git a/.emacs.d/etc/eshell/aliases b/.emacs.d/etc/eshell/aliases
index 203b616..c913598 100644
--- a/.emacs.d/etc/eshell/aliases
+++ b/.emacs.d/etc/eshell/aliases
@@ -17,4 +17,4 @@ alias vi find-file $1
alias vim find-file $1
alias mbsync mbsync -c $XDG_CONFIG_HOME/isync/mbsyncrc $*
alias getmail getmail --getmaildir $XDG_CONFIG_HOME/getmail --rcfile getmailrc $*
-alias m mbsync csclub; mbsync uwaterloo; mbsync shemshak; mbsync gnub; getmail
+alias m mbsync csclub; mbsync uwaterloo; mbsync kelar; mbsync shemshak; mbsync gnub; getmail
diff --git a/.emacs.d/lisp/bandali-gnus.el b/.emacs.d/lisp/bandali-gnus.el
index 58fca3a..febf30f 100644
--- a/.emacs.d/lisp/bandali-gnus.el
+++ b/.emacs.d/lisp/bandali-gnus.el
@@ -49,6 +49,13 @@
`(,@(cond
((string= (system-name) "langa")
'((nnimap
+ "kelar"
+ (nnimap-stream plain)
+ (nnimap-address "127.0.0.1")
+ (nnimap-server-port 143)
+ (nnimap-authenticator plain)
+ (nnimap-user "bandali@kelar.local"))
+ (nnimap
"shemshak"
(nnimap-stream plain)
(nnimap-address "127.0.0.1")
@@ -74,12 +81,20 @@
(from ".+-\\(owner\\|bounces\\)@\\(non\\)?gnu\\.org" "listmod")
;; gnu
(list ".*<\\(.*\\)\\.\\(non\\)?gnu\\.org>.*" "l.\\1")
+ ;; fsf
+ (list ".*<\\(.*\\)\\.fsf\\.org>.*" "l.\\1")
;; gnus
(list ".*<\\(.*\\)\\.gnus\\.org>.*" "l.\\1")
;; libreplanet
(list ".*<\\(.*\\)\\.libreplanet\\.org>.*" "l.\\1")
;; iana (e.g. tz-announce)
(list ".*<\\(.*\\)\\.iana\\.org>.*" "l.\\1")
+ ;; mailop
+ (list ".*<\\(.*\\)\\.mailop\\.org>.*" "l.\\1")
+ ;; sdlu
+ (list ".*<\\(.*\\)\\.spammers\\.dontlike\\.us>.*" "l.sdlu")
+ ;; bitfolk
+ (from ".*@\\(.+\\)?bitfolk\\.com>.*" "bitfolk")
;; haskell
(list ".*<\\(.*\\)\\.haskell\\.org>.*" "l.\\1")
;; *.lists.sr.ht, omitting one dot if present
@@ -298,6 +313,12 @@ jami:bandali")
(to "webmasters-comment@gnu.org")
(body "")
(eval (setq b/message-cite-say-hi nil)))
+ ("nnimap\\+kelar:.*"
+ (address "bandali@kelar.org")
+ ("X-Message-SMTP-Method" "smtp mail.kelar.org 587")
+ (body "\nBest,\n")
+ (gcc "nnimap+kelar:Sent")
+ (eval (setq b/message-cite-say-hi t)))
("nnimap\\+shemshak:.*"
(address "amin@shemshak.org")
("X-Message-SMTP-Method" "smtp mail.shemshak.org 587")
@@ -343,6 +364,7 @@ jami:bandali")
((string= (system-name) "langa")
'((("csc" visible nil nil))
(("uwaterloo" visible nil nil))
+ (("kelar" visible nil nil))
(("shemshak" visible nil nil))
(("gnu" visible nil nil))
(("old-gnu" visible nil nil))))))))
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 0460fc8..f00d1c8 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -6,6 +6,7 @@ max-cache-ttl 10000000
# pinentry-program /home/bandali/.guix-profile/bin/pinentry-emacs
# pinentry-program /usr/bin/pinentry-gtk-2
+# pinentry-program /usr/bin/pinentry-tty
allow-emacs-pinentry
allow-loopback-pinentry
# pinentry-program /home/bandali/usr/dl/pinentry-emacs