X-Git-Url: https://git.shemshak.org/~bandali/configs/blobdiff_plain/b41bfb271ff22c360850ef24a59b1d4b5a82fdaf..009eedfdf1c385b611367ff1b8a661d676461ff1:/rc.org
diff --git a/rc.org b/rc.org
index d1155f1..feee4a4 100644
--- a/rc.org
+++ b/rc.org
@@ -643,7 +643,7 @@ timeout = 0
#+begin_src conf
[user]
name = Amin Bandali
- email = amin@aminb.org
+ email = mab@gnu.org
signingkey = 4E05246AB0BF7FFB
#+end_src
@@ -686,6 +686,8 @@ timeout = 0
pr = pull --rebase
ps = push
psf = push --force
+ nmam = "!f() { notmuch show --format=raw $1 | git am -; }; f"
+ nmam3 = "!f() { notmuch show --format=raw $1 | git am -3 -; }; f"
#+end_src
**** color
@@ -721,8 +723,8 @@ timeout = 0
**** send-email
#+begin_src conf
[sendemail]
- smtpuser = amin@aminb.org
- smtpserver = nix.aminb.org
+ smtpuser = aminb
+ smtpserver = fencepost.gnu.org
smtpserverport = 587
smtpencryption = tls
annotate = yes
@@ -1475,6 +1477,10 @@ from aminb@gnu.org
user aminb
passwordeval gpg2 --no-tty -q -d ~/.passwd/gnu.gpg
+# gnu (new address)
+account gnu-mab : gnu
+from mab@gnu.org
+
# uwaterloo
account uwaterloo
host connect.uwaterloo.ca
@@ -1484,10 +1490,6 @@ user abandali
passwordeval gpg2 --no-tty -q -d ~/.passwd/uwaterloo.gpg
tls_trust_file /etc/ssl/certs/ca-certificates.crt
-# uwaterloo (friendly address)
-account uwaterloo-friendly : uwaterloo
-from amin.bandali@uwaterloo.ca
-
# Set a default account
account default : aminb
#+end_src
@@ -2110,7 +2112,7 @@ path=/home/amin/mail
[user]
name=Amin Bandali
primary_email=amin@aminb.org
-other_email=abandali@uwaterloo.ca;amin.bandali@uwaterloo.ca;aminb@gnu.org;
+other_email=abandali@uwaterloo.ca;mab@gnu.org;aminb@gnu.org;
# Configuration for "notmuch new"
#
@@ -2196,25 +2198,21 @@ sieve-filter -eW -o postmaster_address=postmaster@aminb.org \
#+begin_src sh
# apply sent tag to messages sent by me
-notmuch tag -new +sent -- from:amin@aminb.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca or from:amin.bandali@uwaterloo.ca
+notmuch tag -new +sent -- from:amin@aminb.org or from:mab@gnu.org or from:aminb@gnu.org or from:abandali@uwaterloo.ca
# initial tagging
-notmuch tag -latest -- tag:latest
+notmuch tag -latest -- tag:latest
notmuch tag +inbox +unread +latest -new -- tag:new
# apply tags to lists
#
-notmuch tag -inbox +lists/~sircmpwn/srht-admins -- folder:amin/lists/~sircmpwn/srht-admins
-notmuch tag -inbox +lists/~sircmpwn/srht-announce -- folder:amin/lists/~sircmpwn/srht-announce
-notmuch tag -inbox +lists/~sircmpwn/srht-dev -- folder:amin/lists/~sircmpwn/srht-dev
-notmuch tag -inbox +lists/~sircmpwn/srht-discuss -- folder:amin/lists/~sircmpwn/srht-discuss
-
notmuch tag -inbox +lists/hackernewsletter -- folder:amin/lists/hackernewsletter
notmuch tag -inbox +lists/haskell-weekly -- folder:amin/lists/haskell-weekly
notmuch tag -inbox +pay -- folder:amin/pay
+notmuch tag -inbox +banking -- folder:amin/banking
#
#
@@ -2229,22 +2227,28 @@ notmuch tag -inbox +lists/watform-students -- folder:uwaterloo/lists/Watform-stu
#
#
-notmuch tag -inbox +lists/emacs-devel -- folder:gnu/l/emacs-devel
-notmuch tag -inbox +lists/emacs-orgmode -- folder:gnu/l/emacs-orgmode
-notmuch tag -inbox +lists/emacsconf-discuss -- folder:gnu/l/emacsconf-discuss
-notmuch tag -inbox +lists/fencepost-users -- folder:gnu/l/fencepost-users
-notmuch tag -inbox +lists/guix-devel -- folder:gnu/l/guix-devel
-notmuch tag -inbox +lists/guile-devel -- folder:gnu/l/guile-devel
-notmuch tag -inbox +lists/help-gnu-emacs -- folder:gnu/l/help-gnu-emacs
-notmuch tag -inbox +lists/info-gnu-emacs -- folder:gnu/l/info-gnu-emacs
-notmuch tag -inbox +lists/www-commits -- folder:gnu/l/www-commits
-notmuch tag -inbox +lists/www-discuss -- folder:gnu/l/www-discuss
-notmuch tag -inbox +webmasters -- folder:gnu/webmasters
-
-notmuch tag -inbox +lists/deepspec -- folder:gnu/l/deepspec
-notmuch tag -inbox +lists/haskell-cafe -- folder:gnu/l/haskell-cafe
-notmuch tag -inbox +lists/haskell-art -- folder:gnu/l/haskell-art
-notmuch tag -inbox +lists/notmuch -- folder:gnu/l/notmuch
+notmuch tag -inbox +l/emacs-devel -- folder:gnu/l/emacs-devel
+notmuch tag -inbox +l/emacs-orgmode -- folder:gnu/l/emacs-orgmode
+notmuch tag -inbox +l/emacsconf-discuss -- folder:gnu/l/emacsconf-discuss
+notmuch tag -inbox +l/fencepost-users -- folder:gnu/l/fencepost-users
+notmuch tag -inbox +l/guix-devel -- folder:gnu/l/guix-devel
+notmuch tag -inbox +l/guile-devel -- folder:gnu/l/guile-devel
+notmuch tag -inbox +l/help-gnu-emacs -- folder:gnu/l/help-gnu-emacs
+notmuch tag -inbox +l/info-gnu-emacs -- folder:gnu/l/info-gnu-emacs
+notmuch tag -inbox +l/www-commits -- folder:gnu/l/www-commits
+notmuch tag -inbox +l/www-discuss -- folder:gnu/l/www-discuss
+notmuch tag -inbox +webmasters -- folder:gnu/webmasters
+
+notmuch tag -inbox +l/deepspec -- folder:gnu/l/deepspec
+notmuch tag -inbox +l/haskell-cafe -- folder:gnu/l/haskell-cafe
+notmuch tag -inbox +l/haskell-art -- folder:gnu/l/haskell-art
+notmuch tag -inbox +l/notmuch -- folder:gnu/l/notmuch
+
+notmuch tag -inbox +l/~aminb/test-priv -- folder:gnu/l/~aminb/test-priv
+notmuch tag -inbox +l/~sircmpwn/sr.ht-admins -- folder:gnu/l/~sircmpwn/sr.ht-admins
+notmuch tag -inbox +l/~sircmpwn/sr.ht-announce -- folder:gnu/l/~sircmpwn/sr.ht-announce
+notmuch tag -inbox +l/~sircmpwn/sr.ht-dev -- folder:gnu/l/~sircmpwn/sr.ht-dev
+notmuch tag -inbox +l/~sircmpwn/sr.ht-discuss -- folder:gnu/l/~sircmpwn/sr.ht-discuss
#
notmuch tag -inbox -unread +archive/notmuch -- path:archive/notmuch/**
@@ -2427,6 +2431,19 @@ if anyof (
fileinto :create "l/${listname}";
}
}
+
+if anyof (
+ header :contains "list-id" "<~aminb/test-priv@lists.sr.ht>",
+ header :contains "list-id" "<~sircmpwn/sr.ht-admins@lists.sr.ht>",
+ header :contains "list-id" "<~sircmpwn/sr.ht-announce@lists.sr.ht>",
+ header :contains "list-id" "<~sircmpwn/sr.ht-dev@lists.sr.ht>",
+ header :contains "list-id" "<~sircmpwn/sr.ht-discuss@lists.sr.ht>") {
+ if header :regex "list-id" "(~[a-z_0-9-]+)/([a-z_0-9.-]+)@" {
+ set :lower "username" "${1}";
+ set :lower "listname" "${2}";
+ fileinto :create "l/${username}/${listname}";
+ }
+}
#+end_src
** polybar
@@ -4717,7 +4734,7 @@ zhighlighters=(main brackets pattern)
#
# Load these ssh identities with the ssh module
-zssh_ids=(id_rsa plasma_id_rsa id_ed25519 id_rsa_aur)
+zssh_ids=(id_rsa plasma_id_rsa id_ed25519_mab id_rsa_aur)
#