4 files changed, 44 insertions, 31 deletions
diff --git a/aerc/dot-config/aerc/Notmuch-MIT.qmap b/aerc/dot-config/aerc/Notmuch-MIT.qmap
new file mode 100644
index 0000000..8bb60ee
--- /dev/null
+++ b/aerc/dot-config/aerc/Notmuch-MIT.qmap
@@ -0,0 +1,4 @@
+INBOX = tag:inbox and folder:mit/INBOX and not tag:archived
+18650 = tag:18650 and folder:mit/INBOX and not tag:archived
+18650-org = tag:18650org and folder:mit/INBOX and not tag:archived
+18650-thr = thread:"{tag:18650 and not tag:archived and not tag:sent}"
diff --git a/aerc/dot-config/aerc/accounts.conf b/aerc/dot-config/aerc/accounts.conf
index d03e999..ccfca5b 100644
--- a/aerc/dot-config/aerc/accounts.conf
+++ b/aerc/dot-config/aerc/accounts.conf
@@ -1,31 +1,40 @@
 [MIT]
-source   = maildir://~/.local/share/mail/mit
-outgoing = msmtp -a mit
-default  = INBOX
-from     = Mohammad Reza Karimi <moreka@mit.edu>
-copy-to  = Sent
-postpone = Drafts
-trash    = Deleted
-archive  = Archive
-aliases  = moreka@MIT.EDU,MOREKA@MIT.EDU
-cache-headers = true
-
-check-mail-cmd = mbsync mit
+source             = maildir://~/.local/share/mail/mit
+outgoing           = msmtp -a mit
+default            = INBOX
+from               = Mohammad Reza Karimi <moreka@mit.edu>
+copy-to            = Sent
+postpone           = Drafts
+trash              = Deleted
+archive            = Archive
+aliases            = moreka@MIT.EDU,MOREKA@MIT.EDU
+cache-headers      = true
+check-mail-cmd     = mbsync mit
 check-mail-timeout = 20s
-
-folders-sort = INBOX,Sent,Drafts,Archive
-
+folders-sort       = INBOX,Sent,Drafts,Archive
 
 [Gmail]
-source   = maildir://~/.local/share/mail/m.r.karimi.j@gmail.com
-outgoing = msmtp -a gmail
-default  = INBOX
-from     = Mohammad Reza Karimi <m.r.karimi.j@gmail.com>
-copy-to  = Sent
-postpone = Drafts
-cache-headers = true
-
-check-mail-cmd = mbsync m.r.karimi.j@gmail.com
+source             = maildir://~/.local/share/mail/m.r.karimi.j@gmail.com
+outgoing           = msmtp -a gmail
+default            = INBOX
+from               = Mohammad Reza Karimi <m.r.karimi.j@gmail.com>
+copy-to            = Sent
+postpone           = Drafts
+cache-headers      = true
+check-mail-cmd     = mbsync m.r.karimi.j@gmail.com
 check-mail-timeout = 60s
+folders-sort       = INBOX,Sent
 
-folders-sort = INBOX,Sent
+[Notmuch-MIT]
+source               = notmuch://~/.local/share/mail
+outgoing             = msmtp -a mit
+default              = 18650
+from                 = Mohammad Reza Karimi <moreka@mit.edu>
+copy-to              = Sent
+maildir-store        = ~/.local/share/mail
+maildir-account-path = mit
+query-map            = ~/.config/aerc/Notmuch-MIT.qmap
+check-mail-cmd       = mbsync mit && notmuch new
+check-mail-timeout   = 20s
+folders              = 18650,18650-thr,18650-org,Sent,Archive,INBOX
+folders-sort         = 18650,18650-thr,18650-org,Sent,INBOX,Archive
diff --git a/aerc/dot-config/aerc/aerc.conf b/aerc/dot-config/aerc/aerc.conf
index 084d07e..f2ce995 100644
--- a/aerc/dot-config/aerc/aerc.conf
+++ b/aerc/dot-config/aerc/aerc.conf
@@ -103,6 +103,10 @@ index-columns=flags:5,name<20%,subject,date>=
 column-name = {{if .To}}{{index (.To | names) 0}}{{else}} malformed email{{end}}
 column-flags = {{.Flags | join " "}}
 
+[ui:folder~18650]
+threading-enabled=true
+threading-by-subject=true
+
 [statusline]
 status-columns = account<=,3973e022e932<=,folder<=,status<*,cbe5cfdf7c21>*,cwd>=,e3b0c44298fc>=,e3b0c44298fc>=,tray>=
 column-cwd = {{cwd}}
@@ -129,20 +133,16 @@ editor=nvim
 header-layout=To,From,Subject
 edit-headers=false
 focus-body=false
-
 address-book-cmd=addr-book-combine \
     -c "rg -F -i -- '%s' ~/.cache/maildir-rank-addr/addressbook.tsv" \
     -c "khard email --remove-first-line --parsable '%s' | cut -f 1,2"
-
 file-picker-cmd=lf -selection-path '%f'
-
 reply-to-self=false
 empty-subject-warning=true
 no-attachment-warning=^[^>]*attach(ed|ment)
 format-flowed=true
 
 [multipart-converters]
-
 text/html=pandoc -f markdown -t html --standalone
 
 [filters]
@@ -184,7 +184,7 @@ text/calendar=calendar
 message/delivery-status=colorize
 message/rfc822=colorize
 text/html=pandoc -f html -t plain | colorize
-# text/html=! html
+text/html=! html
 #text/html=! w3m -T text/html -I UTF-8
 text/*=bat -fP --file-name="$AERC_FILENAME"
 application/pdf=pdftotext - -l 10 -nopgbrk -q - | fmt -w 100
diff --git a/aerc/dot-config/aerc/stylesets/default_nicer b/aerc/dot-config/aerc/stylesets/default_nicer
index 57d02b1..d68b43b 100644
--- a/aerc/dot-config/aerc/stylesets/default_nicer
+++ b/aerc/dot-config/aerc/stylesets/default_nicer
@@ -31,7 +31,7 @@ tab.bg = #444444
 
 msglist.selected.bg = #87af87
 msglist_unread.bold = true
-msglist*.fg = #aaaaaa
+msglist*.fg = #bbbbbb
 msglist_unread.fg = #cccccc
 msglist_deleted.dim = true
 msglist_marked.bg = yellow