2 files changed, 32 insertions, 14 deletions
diff --git a/aerc/dot-config/aerc/aerc.conf b/aerc/dot-config/aerc/aerc.conf
index 4e3b133..084d07e 100644
--- a/aerc/dot-config/aerc/aerc.conf
+++ b/aerc/dot-config/aerc/aerc.conf
@@ -23,6 +23,22 @@ default-menu-cmd=fzf --multi
 # width specifier is set, '*' is used by default.
 index-columns=flags:5,name<20%,subject,date>=
 
+threading-enabled = false
+reverse-thread-order = true
+
+thread-prefix-tip = "> "
+# thread-prefix-indent = ""
+# thread-prefix-stem = "│"
+thread-prefix-limb = ""
+# thread-prefix-folded = "+"
+# thread-prefix-unfolded = ""
+# thread-prefix-first-child = "┬"
+# thread-prefix-has-siblings = "├"
+# thread-prefix-orphan = "┌"
+# thread-prefix-dummy = "┬"
+# thread-prefix-lone = " "
+thread-prefix-last-sibling = "╰─"
+thread-prefix-last-sibling-reverse = "╭─"
 
 # Each name in index-columns must have a corresponding column-$name setting.
 # All column-$name settings accept golang text/template syntax. See
@@ -48,7 +64,7 @@ timestamp-format=2006 Jan 02
 this-day-time-format=15:04
 this-week-time-format=Mon Jan 02
 this-year-time-format=Jan 02
-message-view-timestamp-format=2006 Jan 02, 15:04 GMT-0700
+message-view-timestamp-format=Mon 02 Jan 2006, 15:04 GMT-0700
 sidebar-width=14
 # message-list-split=horizontal 20
 mouse-enabled=false
@@ -88,7 +104,7 @@ column-name = {{if .To}}{{index (.To | names) 0}}{{else}} malformed email{{end}}
 column-flags = {{.Flags | join " "}}
 
 [statusline]
-status-columns = account<=,3973e022e932<=,folder<=,status<=,cbe5cfdf7c21<=,cwd<=,e3b0c44298fc<*,e3b0c44298fc>=,tray>=
+status-columns = account<=,3973e022e932<=,folder<=,status<*,cbe5cfdf7c21>*,cwd>=,e3b0c44298fc>=,e3b0c44298fc>=,tray>=
 column-cwd = {{cwd}}
 column-e3b0c44298fc =
 column-tray = {{.TrayInfo}}
@@ -118,7 +134,6 @@ 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
@@ -168,8 +183,8 @@ text/plain=wrap -w 100 | colorize
 text/calendar=calendar
 message/delivery-status=colorize
 message/rfc822=colorize
-#text/html=pandoc -f html -t plain | colorize
-text/html=! html
+text/html=pandoc -f html -t plain | colorize
+# 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/binds.conf b/aerc/dot-config/aerc/binds.conf
index 7c0eb80..b14d7ba 100644
--- a/aerc/dot-config/aerc/binds.conf
+++ b/aerc/dot-config/aerc/binds.conf
@@ -1,3 +1,5 @@
+# vim: ft=confini
+
 <C-p> = :prev-tab<Enter>
 <C-PgUp> = :prev-tab<Enter>
 <C-n> = :next-tab<Enter>
@@ -7,6 +9,7 @@
 <C-c> = :prompt 'Quit?' quit<Enter>
 <C-q> = :prompt 'Quit?' quit<Enter>
 <C-z> = :suspend<Enter>
+gt = :next-tab<Enter>
 
 [messages]
 # q = :prompt 'Quit?' quit<Enter>
@@ -16,14 +19,13 @@ q = :quit<Enter>
 <C-o> = :menu -ad :cf -a<Enter>
 
 j = :next<Enter>
-<Down> = :next<Enter>
 <C-d> = :next 50%<Enter>
 <PgDn> = :next 100%<Enter>
 
 k = :prev<Enter>
-<Up> = :prev<Enter>
 <C-u> = :prev 50%<Enter>
 <PgUp> = :prev 100%<Enter>
+
 gg = :select 0<Enter>
 G = :select -1<Enter>
 
@@ -31,8 +33,8 @@ gi = :cf -a MIT INBOX<Enter>
 gs = :cf -a MIT Sent<Enter>
 ga = :cf -a MIT Archive<Enter>
 
-J = :next-folder<Enter>
-K = :prev-folder<Enter>
+<C-j> = :next-folder<Enter>
+<C-k> = :prev-folder<Enter>
 
 v = :mark -t<Enter>
 <Space> = :mark -t<Enter>:next<Enter>
@@ -57,6 +59,7 @@ D = :delete<Enter>
 a = :archive flat<Enter>
 A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 u = :read -t<Enter>:next<Enter>
+f = :forward -A<Enter>
 
 m = :compose<Enter>
 
@@ -99,17 +102,17 @@ A = :archive flat<Enter>
 <C-y> = :copy-link <space>
 <C-l> = :open-link <space>
 
-f = :forward<Enter>
+f = :forward -A<Enter>
 rr = :reply -a<Enter>
 rq = :reply -aq<Enter>
 Rr = :reply<Enter>
 Rq = :reply -q<Enter>
 
 H = :toggle-headers<Enter>
-K = :prev-part<Enter>
-J = :next-part<Enter>
-<C-j> = :next<Enter>
-<C-k> = :prev<Enter>
+<C-k> = :prev-part<Enter>
+<C-j> = :next-part<Enter>
+# <C-j> = :next<Enter>
+# <C-k> = :prev<Enter>
 
 [view::passthrough]
 $noinherit = true