From 64d152f05fd4754fe1f48e37f1b9875b7b5f43b1 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 17 Jan 2019 07:57:07 +0100
Subject: [PATCH] more adherence to standards

---
 email/.config/mutt/muttrc                                   | 6 +++---
 email/.config/notmuch/config                                | 2 +-
 email/.config/offlineimap/config                            | 2 +-
 email/{.config/mutt => .local/bin}/checkattach.sh           | 0
 email/{.config/offlineimap => .local/bin}/newmail.sh        | 2 +-
 .../{.config/mutt/force_sync.sh => .local/bin/sync_mail.sh} | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename email/{.config/mutt => .local/bin}/checkattach.sh (100%)
 rename email/{.config/offlineimap => .local/bin}/newmail.sh (60%)
 rename email/{.config/mutt/force_sync.sh => .local/bin/sync_mail.sh} (100%)

diff --git a/email/.config/mutt/muttrc b/email/.config/mutt/muttrc
index 98f54ca..4312542 100644
--- a/email/.config/mutt/muttrc
+++ b/email/.config/mutt/muttrc
@@ -13,16 +13,16 @@ set mask="!^\\.[^.]"
 source ~/.local/share/offlineimap/mailboxes
 
 # Receiving, sending and searching
-set sendmail="/home/mrl/.config/mutt/checkattach.sh msmtp -a net"
+set sendmail="checkattach.sh msmtp -a net"
 set send_charset="us-ascii:utf-8"
 macro index,pager $ "<shell-escape>/home/mrl/.config/mutt/force_sync.sh<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
 
 # Set the correct msmtp account for the different addresses
 send2-hook '~f mart@martlubbers.net'\
-	'set sendmail="/home/mrl/.config/mutt/checkattach.sh msmtp -a net"'
+	'set sendmail="checkattach.sh msmtp -a net"'
 send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl))'\
-	'set sendmail="/home/mrl/.config/mutt/checkattach.sh msmtp -a ru"'
+	'set sendmail="checkattach.sh msmtp -a ru"'
 
 # Macro for switching to the ru address
 macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>"
diff --git a/email/.config/notmuch/config b/email/.config/notmuch/config
index e9150a6..f104340 100644
--- a/email/.config/notmuch/config
+++ b/email/.config/notmuch/config
@@ -11,7 +11,7 @@
 # configured here named ".notmuch".
 #
 [database]
-path=/home/mrl/.mutt/mail
+path=/home/mrl/.local/share/offlineimap/mail
 
 # User configuration
 #
diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config
index 91354dc..f3a309f 100644
--- a/email/.config/offlineimap/config
+++ b/email/.config/offlineimap/config
@@ -9,7 +9,7 @@ localrepository = Local
 remoterepository = Remote
 autorefresh = 0.5
 quick = 10
-postsynchook = ~/.config/offlineimap/newmail.sh
+postsynchook = newmail.sh
 #proxy = SOCKS5:localhost:8008
 
 [Repository Local]
diff --git a/email/.config/mutt/checkattach.sh b/email/.local/bin/checkattach.sh
similarity index 100%
rename from email/.config/mutt/checkattach.sh
rename to email/.local/bin/checkattach.sh
diff --git a/email/.config/offlineimap/newmail.sh b/email/.local/bin/newmail.sh
similarity index 60%
rename from email/.config/offlineimap/newmail.sh
rename to email/.local/bin/newmail.sh
index 84c30c6..8d8c35c 100755
--- a/email/.config/offlineimap/newmail.sh
+++ b/email/.local/bin/newmail.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-newmail="$(find ~/.mutt/mail/INBOX/new/ -type f | wc -l)"
+newmail="$(find ~/.local/share/mutt/mail/INBOX/new/ -type f | wc -l)"
 if [ "$newmail" -ne 0 ]
 then
 	notify-send "$newmail new emails!"
diff --git a/email/.config/mutt/force_sync.sh b/email/.local/bin/sync_mail.sh
similarity index 100%
rename from email/.config/mutt/force_sync.sh
rename to email/.local/bin/sync_mail.sh
-- 
2.20.1