changesnetbsd

3 files changed, 4 insertions, 2 deletions

diff --git a/config/aerc/accounts.conf b/config/aerc/accounts.conf
index 7167eb6..f104d32 100644
--- a/config/aerc/accounts.conf
+++ b/config/aerc/accounts.conf
@@ -4,6 +4,7 @@ outgoing          = smtps+plain://marcc%40fastmail.fr@smtp.fastmail.com:465
 default           = INBOX
 outgoing-cred-cmd = pass fastmail/marcc
 from              = "Marc Coquand" <marc@mccd.space>
+address-book-cmd  = grep -F -i -- "%s" "/home/mccd/.local/share/maildir2addr/addrs.tsv"
 copy-to           = Sent
 
 [Work]
diff --git a/config/aerc/aerc.conf b/config/aerc/aerc.conf
index 439bb4a..9729724 100644
--- a/config/aerc/aerc.conf
+++ b/config/aerc/aerc.conf
@@ -379,6 +379,7 @@ parse-http-links=true
 # Specifies the command to run the editor with. It will be shown in an embedded
 # terminal, though it may also launch a graphical window if the environment
 # supports it. Defaults to $EDITOR, or vi.
+editor=vim
 
 #
 # Default header fields to display when composing a message. To display
@@ -399,7 +400,6 @@ parse-http-links=true
 # ignored.
 #
 # This parameter can also be set per account in accounts.conf.
-#address-book-cmd=
 
 # Specifies the command to be used to select attachments. Any occurence of '%s'
 # in the file-picker-cmd will be replaced the argument <arg> to :attach -m
diff --git a/config/aerc/binds.conf b/config/aerc/binds.conf
index db96bca..3296c29 100644
--- a/config/aerc/binds.conf
+++ b/config/aerc/binds.conf
@@ -68,6 +68,7 @@ S = :save<space>
 | = :pipe<space>
 D = :delete<Enter>
 A = :archive flat<Enter>
+ga = :pipe -mb git am -3<Enter>
 
 <C-l> = :open-link <space>
 
@@ -133,4 +134,4 @@ $ex = <C-x>
 D = :mv Trash<Enter>
 
 [messages:account=Work]
-D = :mv [Gmail]/Bin<Enter>
+D = :mv [Gmail]/Trash<Enter>