7 files changed, 29 insertions, 3 deletions
diff --git a/aerc/.config/aerc/Development.qmap b/aerc/.config/aerc/Development.qmap
new file mode 100644
index 0000000..60418a0
--- /dev/null
+++ b/aerc/.config/aerc/Development.qmap
@@ -0,0 +1 @@
+INBOX = tag:inbox and not tag:archived
diff --git a/aerc/.config/aerc/Job.qmap b/aerc/.config/aerc/Job.qmap
new file mode 100644
index 0000000..60418a0
--- /dev/null
+++ b/aerc/.config/aerc/Job.qmap
@@ -0,0 +1 @@
+INBOX = tag:inbox and not tag:archived
diff --git a/aerc/.config/aerc/Personal.qmap b/aerc/.config/aerc/Personal.qmap
index b9094ee..16cd958 100644
--- a/aerc/.config/aerc/Personal.qmap
+++ b/aerc/.config/aerc/Personal.qmap
@@ -1,5 +1,12 @@
+_INBOX = tag:inbox and not tag:maillist and not tag:trash and not tag:sent and not tag:spam and not tag:draft
+_Trash = tag:trash
+_Sent = tag:sent
+_Spam = tag:spam
+_Drafts = tag:draft
+
 info-gnu = tag:info-gnu
 info-guix = tag:info-guix
+help-guix = tag:help-guix
 sg7 = tag:sg7
 sg13 = tag:sg13
 sg14 = tag:sg14
@@ -9,3 +16,7 @@ std-discussion = tag:std-discussion
 std-proposals = tag:std-proposals
 notmuch = tag:notmuch
 rjarry-aerc-discuss = tag:rjarry-aerc-discuss
+pgsql-general = tag:pgsql-general
+boost = tag:boost
+boost-users = tag:boost-users
+zsh-users = tag:zsh-users
diff --git a/aerc/.config/aerc/TestMail.qmap b/aerc/.config/aerc/TestMail.qmap
new file mode 100644
index 0000000..60418a0
--- /dev/null
+++ b/aerc/.config/aerc/TestMail.qmap
@@ -0,0 +1 @@
+INBOX = tag:inbox and not tag:archived
diff --git a/aerc/.config/aerc/accounts.conf b/aerc/.config/aerc/accounts.conf
index fdec2f1..d00167d 100644
--- a/aerc/.config/aerc/accounts.conf
+++ b/aerc/.config/aerc/accounts.conf
@@ -10,6 +10,7 @@ maildir-store = ~/Mail/personal
 query-map     = ~/.config/aerc/Personal.qmap
 outgoing-cred-cmd = pass Email/personal@rozanov.info
 check-mail-cmd = NOTMUCH_PROFILE=personal notmuch new
+multi-file-strategy = act-dir
 
 [Development]
 source        = notmuch://~/Mail/dev
@@ -31,6 +32,16 @@ maildir-store = ~/Mail/job
 outgoing-cred-cmd = pass Email/job@rozanov.info
 check-mail-cmd = NOTMUCH_PROFILE=job notmuch new
 
+[Accounts]
+source        = notmuch://~/Mail/account
+outgoing      = smtp://account@rozanov.info@mail.rozanov.info:587
+default       = INBOX
+from          = Daniil Rozanov <account@rozanov.info>
+maildir-store = ~/Mail/account
+# query-map     = ~/.config/aerc/Account.qmap
+outgoing-cred-cmd = pass Email/account@rozanov.info
+check-mail-cmd = NOTMUCH_PROFILE=account notmuch new
+
 [TestMail]
 source        = notmuch://~/Mail/testmail
 outgoing      = smtp://testmail@rozanov.info@mail.rozanov.info:587
diff --git a/aerc/.config/aerc/aerc.conf b/aerc/.config/aerc/aerc.conf
index 0cd144d..deb8cf7 100644
--- a/aerc/.config/aerc/aerc.conf
+++ b/aerc/.config/aerc/aerc.conf
@@ -604,7 +604,7 @@ pager=less -Rc
 # none of their specified headers are present in the message.
 #
 # Default: From|To,Cc|Bcc,Date,Subject
-#header-layout=From|To,Cc|Bcc,Date,Subject
+header-layout=From,To,Cc,Bcc,Date,Subject
 
 # Whether to always show the mimetype of an email, even when it is just a single part
 #
@@ -674,7 +674,7 @@ pager=less -Rc
 # ignored.
 #
 # This parameter can also be set per account in accounts.conf.
-#address-book-cmd=
+address-book-cmd=abook --mutt-query '%s'
 
 # Specifies the command to be used to select attachments. Any occurrence of
 # '%s' in the file-picker-cmd will be replaced with the argument <arg>
diff --git a/aerc/.config/aerc/binds.conf b/aerc/.config/aerc/binds.conf
index cebb942..58397e9 100644
--- a/aerc/.config/aerc/binds.conf
+++ b/aerc/.config/aerc/binds.conf
@@ -15,6 +15,7 @@
 
 [messages]
 q = :prompt 'Quit?' quit<Enter>
+md = :modify-labels +trash<Enter>
 <C-r> = :check-mail<Enter>
 
 j = :next<Enter>
@@ -63,7 +64,7 @@ a = :archive flat<Enter>
 A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 
 C = :compose<Enter>
-m = :compose<Enter>
+# m = :compose<Enter>
 
 b = :bounce<space>