summaryrefslogtreecommitdiffstats
path: root/mutt
diff options
context:
space:
mode:
Diffstat (limited to 'mutt')
-rwxr-xr-xmutt/.config/mutt/choose-muttrc-type12
-rw-r--r--mutt/.config/mutt/imap (renamed from mutt/imap)0
-rw-r--r--mutt/.config/mutt/local (renamed from mutt/offlineimap)2
-rw-r--r--mutt/.config/mutt/mailcap (renamed from mutt/mailcap)0
-rw-r--r--mutt/.config/mutt/muttrc (renamed from mutt/muttrc)11
-rw-r--r--mutt/Makefile5
-rwxr-xr-xmutt/choose-muttrc-type12
7 files changed, 24 insertions, 18 deletions
diff --git a/mutt/.config/mutt/choose-muttrc-type b/mutt/.config/mutt/choose-muttrc-type
new file mode 100755
index 0000000..ddadb70
--- /dev/null
+++ b/mutt/.config/mutt/choose-muttrc-type
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -eu
+set -o pipefail
+
+case "$(hostname)" in
+hornet)
+ echo 'source ~/.config/mutt/local'
+ ;;
+*)
+ echo 'source ~/.config/mutt/imap'
+ ;;
+esac
diff --git a/mutt/imap b/mutt/.config/mutt/imap
index 13ed472..13ed472 100644
--- a/mutt/imap
+++ b/mutt/.config/mutt/imap
diff --git a/mutt/offlineimap b/mutt/.config/mutt/local
index e22fe53..636bd29 100644
--- a/mutt/offlineimap
+++ b/mutt/.config/mutt/local
@@ -10,7 +10,7 @@ mailboxes `\
echo -n "\"=$basename\" ";\
fi\
done`
-macro index R "<enter-command>unset wait_key<enter><shell-escape>update-mail<enter><enter-command>set wait_key<enter>" "fetch mail with offlineimap"
+macro index R "<enter-command>unset wait_key<enter><shell-escape>kill -HUP $(systemctl --user show --property MainPID --value mbsyncloop)<enter><enter-command>set wait_key<enter>" "fetch mail with mbsync"
set timeout=3
# vim: ft=neomuttrc
diff --git a/mutt/mailcap b/mutt/.config/mutt/mailcap
index a791985..a791985 100644
--- a/mutt/mailcap
+++ b/mutt/.config/mutt/mailcap
diff --git a/mutt/muttrc b/mutt/.config/mutt/muttrc
index 112fc3b..8321ba1 100644
--- a/mutt/muttrc
+++ b/mutt/.config/mutt/muttrc
@@ -1,10 +1,11 @@
-source '~/.mutt/choose-muttrc-type|'
+source '~/.config/mutt/choose-muttrc-type|'
# folders {{{
set record="=Sent"
set postponed="=Drafts"
set header_cache="~/.cache/mutt/headers"
set message_cachedir="~/.cache/mutt/bodies"
-set mailcap_path="~/.mutt/mailcap"
+set mailcap_path="~/.config/mutt/mailcap"
+set nm_default_url="notmuch://$HOME/.cache/notmuch"
# }}}
# identity {{{
# i am "Jesse Luehrs <doy@tozt.net>"
@@ -115,8 +116,8 @@ set quit
bind generic , enter-command
bind generic,pager,index B help
-bind generic,compose i exit
-bind index i noop
+bind pager,compose,attach i exit
+bind generic,index i noop
bind generic,pager,index ? search-reverse
bind generic,pager,index p search-opposite
@@ -140,7 +141,7 @@ macro index,pager I "c=INBOX<enter>"
bind index,pager M compose-to-sender
bind index,pager A group-reply
-macro index S "<enter-command>set resolve=no<enter><clear-flag>N<save-message>=spam<enter><enter-command>set resolve=yes<enter>" "mark message as spam"
+macro index S "<enter-command>set resolve=no<enter><clear-flag>N<save-message>=Junk<enter><enter-command>set resolve=yes<enter>" "mark message as spam"
bind editor <tab> complete-query
# }}}
diff --git a/mutt/Makefile b/mutt/Makefile
new file mode 100644
index 0000000..2caf3fd
--- /dev/null
+++ b/mutt/Makefile
@@ -0,0 +1,5 @@
+include ../Makefile.include
+
+install:
+ @mkdir -p $(HOME)/.cache/mutt/headers
+ @mkdir -p $(HOME)/.cache/mutt/bodies
diff --git a/mutt/choose-muttrc-type b/mutt/choose-muttrc-type
deleted file mode 100755
index 46b2cbe..0000000
--- a/mutt/choose-muttrc-type
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -eu
-set -o pipefail
-
-case "$(hostname)" in
-hush)
- echo 'source ~/.mutt/offlineimap'
- ;;
-*)
- echo 'source ~/.mutt/imap'
- ;;
-esac