X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/ce79d14b5797b9512b8078fbcf8a31b9e15108b5..74ef10b067c185020b35344229f383666080d45b:/rc.org

diff --git a/rc.org b/rc.org
index c596286..1ac68f8 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,7 +2198,7 @@ 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
@@ -2215,6 +2217,7 @@ 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
 # </aminb>
 
 # <uw>
@@ -3740,7 +3743,10 @@ input "1:1:AT_Translated_Set_2_keyboard" {
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
-    floating_modifier $mod
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
 
     # reload the configuration file
     bindsym $mod+Shift+c reload