From 886fcf0cbe424a65df009dd486e12f8830302e6e Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Wed, 16 Jan 2019 16:18:11 +0100 Subject: [PATCH] mutt to xdg spec --- dirs.sh | 3 +-- email/{.mutt => .config/mutt}/checkattach.sh | 0 email/{.mutt => .config/mutt}/colors.muttrc | 0 email/{.mutt => .config/mutt}/force_sync.sh | 0 email/{.mutt => .config/mutt}/gpg.muttrc | 0 email/{.mutt => .config/mutt}/mailcap | 0 email/{.mutt => .config/mutt}/muttrc | 24 +++++++++---------- email/{.mutt => .config/mutt}/notmuch.muttrc | 0 email/{.mutt => .config/mutt}/sidebar.muttrc | 0 email/.config/offlineimap/config | 10 ++++---- .../{.mutt => .config/offlineimap}/newmail.sh | 0 11 files changed, 17 insertions(+), 20 deletions(-) rename email/{.mutt => .config/mutt}/checkattach.sh (100%) rename email/{.mutt => .config/mutt}/colors.muttrc (100%) rename email/{.mutt => .config/mutt}/force_sync.sh (100%) rename email/{.mutt => .config/mutt}/gpg.muttrc (100%) rename email/{.mutt => .config/mutt}/mailcap (100%) rename email/{.mutt => .config/mutt}/muttrc (79%) rename email/{.mutt => .config/mutt}/notmuch.muttrc (100%) rename email/{.mutt => .config/mutt}/sidebar.muttrc (100%) rename email/{.mutt => .config/offlineimap}/newmail.sh (100%) diff --git a/dirs.sh b/dirs.sh index bcf64f2..1828346 100644 --- a/dirs.sh +++ b/dirs.sh @@ -1,5 +1,4 @@ -mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,tmux} -mkdir -pv ~/.mutt +mkdir -pv ~/.config/{mutt,khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,tmux} mkdir -pv ~/.bash_completion.d mkdir -pv ~/.gnupg mkdir -pv ~/.vim/{ftplugin,after/ftplugin,autoload,bundle,spell,pack/plugins/{opt,start}} diff --git a/email/.mutt/checkattach.sh b/email/.config/mutt/checkattach.sh similarity index 100% rename from email/.mutt/checkattach.sh rename to email/.config/mutt/checkattach.sh diff --git a/email/.mutt/colors.muttrc b/email/.config/mutt/colors.muttrc similarity index 100% rename from email/.mutt/colors.muttrc rename to email/.config/mutt/colors.muttrc diff --git a/email/.mutt/force_sync.sh b/email/.config/mutt/force_sync.sh similarity index 100% rename from email/.mutt/force_sync.sh rename to email/.config/mutt/force_sync.sh diff --git a/email/.mutt/gpg.muttrc b/email/.config/mutt/gpg.muttrc similarity index 100% rename from email/.mutt/gpg.muttrc rename to email/.config/mutt/gpg.muttrc diff --git a/email/.mutt/mailcap b/email/.config/mutt/mailcap similarity index 100% rename from email/.mutt/mailcap rename to email/.config/mutt/mailcap diff --git a/email/.mutt/muttrc b/email/.config/mutt/muttrc similarity index 79% rename from email/.mutt/muttrc rename to email/.config/mutt/muttrc index 6dd6c09..98f54ca 100644 --- a/email/.mutt/muttrc +++ b/email/.config/mutt/muttrc @@ -5,24 +5,24 @@ set use_from=yes set reverse_name=yes set envelope_from=yes set mbox_type=Maildir -set folder=~/.mutt/mail +set folder=~/.local/share/offlineimap/mail set spoolfile=+/INBOX/ set record=+/Sent/ set postponed=+/Drafts/ set mask="!^\\.[^.]" -source ~/.mutt/mailboxes +source ~/.local/share/offlineimap/mailboxes # Receiving, sending and searching -set sendmail="/home/mrl/.mutt/checkattach.sh msmtp -C /home/mrl/.config/msmtp/config" +set sendmail="/home/mrl/.config/mutt/checkattach.sh msmtp -a net" set send_charset="us-ascii:utf-8" -macro index,pager $ "/home/mrl/.mutt/force_sync.sh" "Force refresh" +macro index,pager $ "/home/mrl/.config/mutt/force_sync.sh" "Force refresh" macro attach B "firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"" # Set the correct msmtp account for the different addresses send2-hook '~f mart@martlubbers.net'\ - 'set sendmail="msmtp -C /home/mrl/.config/msmtp/config -a net"' + 'set sendmail="/home/mrl/.config/mutt/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="msmtp -C /home/mrl/.config/msmtp/config -a ru"' + 'set sendmail="/home/mrl/.config/mutt/checkattach.sh msmtp -a ru"' # Macro for switching to the ru address macro compose 2 "f^UMart Lubbers " @@ -30,8 +30,6 @@ macro compose 2 "f^UMart Lubbers " send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl)) (~g|~G)'\ 'push c' -#folder-hook . push "~=$" - # Key bindings bind index gg first-entry bind index G last-entry @@ -60,7 +58,7 @@ set editor=vim set duplicate_threads=yes ignore headers * unignore headers from to subject date cc -set mailcap_path=~/.mutt/mailcap +set mailcap_path=~/.config/mutt/mailcap set mailcap_sanitize=yes # w3m --dump @@ -92,13 +90,13 @@ macro index,pager A \ "add the sender email address to khard" # sidebar -source ~/.mutt/sidebar.muttrc +source ~/.config/mutt/sidebar.muttrc # notmuch -source ~/.mutt/notmuch.muttrc +source ~/.config/mutt/notmuch.muttrc # Crypto -source ~/.mutt/gpg.muttrc +source ~/.config/mutt/gpg.muttrc # Colors -source ~/.mutt/colors.muttrc +source ~/.config/mutt/colors.muttrc diff --git a/email/.mutt/notmuch.muttrc b/email/.config/mutt/notmuch.muttrc similarity index 100% rename from email/.mutt/notmuch.muttrc rename to email/.config/mutt/notmuch.muttrc diff --git a/email/.mutt/sidebar.muttrc b/email/.config/mutt/sidebar.muttrc similarity index 100% rename from email/.mutt/sidebar.muttrc rename to email/.config/mutt/sidebar.muttrc diff --git a/email/.config/offlineimap/config b/email/.config/offlineimap/config index 621d9e4..91354dc 100644 --- a/email/.config/offlineimap/config +++ b/email/.config/offlineimap/config @@ -1,6 +1,6 @@ [general] pythonfile = ~/.config/offlineimap/offlineimap.py -metadata = ~/.mutt/offlineimap_meta +metadata = ~/.local/share/offlineimap accounts = net ui = blinkenlights @@ -9,12 +9,12 @@ localrepository = Local remoterepository = Remote autorefresh = 0.5 quick = 10 -postsynchook = /home/mrl/.mutt/newmail.sh +postsynchook = ~/.config/offlineimap/newmail.sh #proxy = SOCKS5:localhost:8008 [Repository Local] type = Maildir -localfolders = ~/.mutt/mail +localfolders = ~/.local/share/offlineimap/mail [Repository Remote] type = IMAP @@ -29,9 +29,9 @@ holdconnectionopen = yes [mbnames] enabled = yes -filename = ~/.mutt/mailboxes +filename = ~/.local/share/offlineimap/mailboxes header = "mailboxes " -peritem = "~/.mutt/mail/%(foldername)s/" +peritem = "~/.local/share/offlineimap/mail/%(foldername)s/" sep = " " footer = "\n" incremental = yes diff --git a/email/.mutt/newmail.sh b/email/.config/offlineimap/newmail.sh similarity index 100% rename from email/.mutt/newmail.sh rename to email/.config/offlineimap/newmail.sh -- 2.20.1