start new

Signed-off-by: Robert Günzler <r@gnzler.io>

7 files changed, 57 insertions, 94 deletions

diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 0b55543..2dd82e2 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -9,21 +9,25 @@ border-char-vertical="│"
 border-char-horizontal="─"
 styleset-name=r
 
+threading-enabled=true
+mouse-enabled=true
+
 [ui:folder~^(Drafts|Sent Items)$]
 index-columns = flags:4,to<20%,subject,date>=
 column-to = {{index (.To | names) 0}}
 
-[viewer]
-# Default: less -R
-# pager=page
-# pager=less -g -i -M -s -S -w -X
-pager=less -c -F -i -R -s -~ --mouse
-# pager=bat --style=plain --color=always --language=email --wrap=character
+[ui:account=notmuch]
+index-columns = flags:4,name<20%,subject,date>=
+column-tags = {{.Labels | join " " }}
+
+[statusline]
+column-left=[{{.Account}}][Q:{{exec "msmtp-queue-stat" "" | replace `\s+$` "" }}] {{.StatusInfo}}
 
+[viewer]
 always-show-mime=true
 
 [compose]
-address-book-cmd=sh -c 'grep -i --color=never %s $HOME/mail/addressbook'
+address-book-cmd=sh -c 'grep -i -m 100 --color=never %s $HOME/mail/addressbook'
 file-picker-cmd=porta filechooser
 
 [filters]
@@ -31,11 +35,6 @@ file-picker-cmd=porta filechooser
 #from,thatguywhodoesnothardwraphismessages=fmt -w 72 | colorize
 X-GitHub-Recipient,robertgzr=github-review-fix | colorize
 
-# application/pdf=pdf
-# image/*=vv
-# text/*=bat -fP --file-name="$AERC_FILENAME"
-application/x-sh=bat -fP -l sh
-
 # keep defaults around
 text/html=html | colorize
 text/plain=wrap | colorize
@@ -44,4 +43,4 @@ message/delivery-status=colorize
 message/rfc822=colorize
 
 [hooks]
-mail-received=notify-send -i /usr/share/icons/mdi/scalable/email-fast-outline.svg -a aerc "[$AERC_ACCOUNT/$AERC_FOLDER] new mail from $AERC_FROM_NAME" "$AERC_SUBJECT"
+mail-received=fyi -a aerc "[$AERC_ACCOUNT/$AERC_FOLDER] new mail from $AERC_FROM_NAME" "$AERC_SUBJECT"
diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf
index 238941f..ea31df7 100644
--- a/.config/aerc/binds.conf
+++ b/.config/aerc/binds.conf
@@ -13,6 +13,8 @@ j = :next<cr>
 k = :prev<cr>
 <Up> = :prev<cr>
 <PgUp> = :prev 100%<cr>
+<C-u> = :prev 33%<cr>
+<C-d> = :next 33%<cr>
 gg = :select 0<cr>
 G = :select -1<cr>
 
@@ -24,6 +26,8 @@ v = :mark -t<cr>
 
 <cr> = :view<cr>
 <S-cr> = :vsplit<cr>
+<C-v> = :vsplit<cr>
+<C-s> = :split<cr>
 <space> = :read -t<cr>
 dd = :read<cr> :mv Trash<cr>
 a = :read<cr> :archive year<cr>
@@ -81,14 +85,15 @@ zo = :open-thread<cr>
 
 [messages:account=gnzler]
 ga = :cf Archive/2024<cr>
-gs = :clear<cr>:filter -a @lists.sr.ht<cr>
-gh = :clear<cr>:filter -H 'X-Github-Recipient: robertgzr'<cr>
-gp = :clear<cr>:filter -a 'alpinelinux.org'<cr>
-gt = :clear<cr>:filter -H 'X-Bugzilla-URL: https://bugs.gentoo.org'<cr>
+gs = :clear<cr>:filter -H 'List-ID:lists.sr.ht'<cr>
+gh = :clear<cr>:filter -H 'List-ID:github.com'<cr>
+# / = :ct notmuch<cr>:cf<space>
 
 [messages:folder=Drafts]
 <cr> = :recall<cr>
 
+[messages:account=notmuch]
+dd = :read<cr>:mv Trash<cr>
 
 [view]
 <C-k> = :prev-part<cr>
@@ -97,8 +102,8 @@ gt = :clear<cr>:filter -H 'X-Bugzilla-URL: https://bugs.gentoo.org'<cr>
 <C-h> = :prev-tab<cr>
 <C-l> = :next-tab<cr>
 
-<C-p> = :prev<cr>
 <C-n> = :next<cr>
+<C-p> = :prev<cr>
 
 q = :close<cr>
 | = :pipe<space>
@@ -107,7 +112,7 @@ S = :save<space>
 A = :prompt 'Really archive?' archive year<cr>
 O = :open porta open-uri<space>
 
-f = :forward<cr>
+F = :forward<cr>
 rr = :reply -a<cr>
 rq = :reply -aq<cr>
 rQ = :reply -aQ<cr>
diff --git a/.config/aerc/filters/html b/.config/aerc/filters/html
deleted file mode 100755
index 6771fa7..0000000
--- a/.config/aerc/filters/html
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec firejail --quiet --noprofile --net=none -- \
-	w3m \
-	-I UTF-8 \
-	-T text/html \
-	-X -cols "$(tput cols)" \
-	-dump \
-	-o display_image=1 \
-	-o display_link_number=1 \
-	-o inline_img_protocol=4
diff --git a/.config/aerc/stylesets/r b/.config/aerc/stylesets/r
index 9c37d55..4cf9811 100644
--- a/.config/aerc/stylesets/r
+++ b/.config/aerc/stylesets/r
@@ -1,37 +1,47 @@
+*.selected.fg = black
+*.selected.bg = #70649a
+*.selected.reverse = false
+
+error.fg = black
+error.bg = 1
+success.fg = black
+success.bg = 2
+warning.fg = black
+warning.bg = 3
+
 msglist_unread.italic = true
 msglist_unread.bold = false
 
 msglist_flagged.fg = 3
 msglist_flagged.bold = true
 
-tab.reverse = false
-
-border.bg = black
-border.fg = 5
-
-statusline_default.bg = black
-statusline_default.fg = white
+msglist_marked.fg = 7
+msglist_marked.bg = 8
 
-*.selected.bg = 5
-*.selected.fg = black
-*.selected.reverse = false
+msglist_pill.bg = #70649a
 
-msglist_default.List-ID,~/github\.com/.bg = #52433d
-msglist_default.List-ID,~/github\.com/.fg = white
+border.fg = #70649a
+border.bg = default
 
-msglist_default.List-ID,~/lists\.sr\.ht/.bg = #0f2540
-msglist_default.List-ID,~/lists\.sr\.ht/.fg = white
+header.fg = #70649a
 
-msglist_default.To,~/lists\.sr\.ht/.bg = #0f2540
-msglist_default.To,~/lists\.sr\.ht/.fg = white
+title.fg = black
+title.bg = #70649a
 
-msglist_default.List-ID,~/openstreetmap\.org/.bg = #0f4c3a
-msglist_default.List-ID,~/openstreetmap\.org/.fg = white
+tab.bg = black
+tab.fg = white
 
-msglist_default.List-ID,~/alpinelinux\.org/.bg = #4d5139
-msglist_default.List-ID,~/alpinelinux\.org/.fg = white
-msglist_default.From,~/@alpinelinux\.org/.bg = #4d5139
-msglist_default.From,~/@alpinelinux\.org/.fg = white
+statusline_default.fg = white
+statusline_default.bg = black
 
-msglist_default.X-Bugzilla-URL,~/bugs\.gentoo\.org/.bg = #3c2f41
-msglist_default.X-Bugzilla-URL,~/bugs\.gentoo\.org/.fg = white
+part_filename.fg = dimgray
+part_mimetype.fg = default
+
+msglist_default.List-ID,~/github\.com/.fg = dimgray
+msglist_default.List-ID,~/lists\.sr\.ht/.fg = 4
+msglist_default.To,~/lists\.sr\.ht/.fg = 4
+msglist_default.List-ID,~/openstreetmap\.org/.fg = 1
+msglist_default.List-ID,~/alpinelinux\.org/.fg = 6
+msglist_default.From,~/@alpinelinux\.org/.fg = 6
+msglist_default.X-Bugzilla-URL,~/bugs\.gentoo\.org/.fg = 5
+msglist_default.From,~/quad9.net/.fg = palevioletred
diff --git a/.config/aerc/templates/new b/.config/aerc/templates/new
deleted file mode 100644
index 54002bd..0000000
--- a/.config/aerc/templates/new
+++ /dev/null
@@ -1,7 +0,0 @@
-{{range $idx, $elm := .To -}}
-{{if eq (exec `grep -q 'sr.ht$' && printf '1'` $elm.Address) "1" -}}
-From: "Robert Günzler" <r@gnzler.io>
-{{- end}}
-{{- end}}
-X-Mailer: aerc {{version}}
-
diff --git a/.config/aerc/templates/quoted_reply b/.config/aerc/templates/quoted_reply
deleted file mode 100644
index e39e6b4..0000000
--- a/.config/aerc/templates/quoted_reply
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- $From := (index .From 0) }}{{ $To := .To -}}
-{{- range $idx, $elm := .To -}}
-	{{- if eq (exec `grep -q 'sr.ht$' && printf '1'` $elm.Address) "1"}}{{$From = `"Robert Günzler" <r@gnzler.io>`}}{{end -}}
-
-	{{- if eq (exec `grep -q '@gnzler.*$' && printf '1'` $elm.Address) "1" -}}
-		{{- $From = (printf `%s` $elm) -}}
-		{{- $To = (drop $To $idx) -}}
-	{{- end -}}
-{{- end -}}
-
-From: {{$From}}
-To: {{range $To}}{{.}},{{end}}
-X-Mailer: aerc {{version}}
-
-On {{dateFormat (.OriginalDate | toLocal) "Mon Jan 2, 2006 at 3:04 PM MST"}}, {{with (index .OriginalFrom 0)}}{{with .Name}}{{.}} {{end}}<{{.Address}}>{{end}} wrote:
-{{if eq .OriginalMIMEType "text/html"}}{{exec `/usr/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
-{{else}}
-{{quote .OriginalText}}
-{{end}}
diff --git a/.config/aerc/templates/reply b/.config/aerc/templates/reply
deleted file mode 100644
index 0736c68..0000000
--- a/.config/aerc/templates/reply
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- $From := (index .From 0) }}{{ $To := .To -}}
-{{- range $idx, $elm := .To -}}
-	{{- if eq (exec `grep -q 'sr.ht$' && printf '1'` $elm.Address) "1"}}{{$From = `"Robert Günzler" <r@gnzler.io>`}}{{end -}}
-
-	{{- if eq (exec `grep -q '@gnzler.*$' && printf '1'` $elm.Address) "1" -}}
-		{{- $From = (printf `%s` $elm) -}}
-		{{- $To = (drop $To $idx) -}}
-	{{- end -}}
-{{- end -}}
-
-From: {{$From}}
-To: {{range $To}}{{.}},{{end}}
-X-Mailer: aerc {{version}}
-
-Hi {{(index .OriginalFrom 0).Name}},