Merge remote-tracking branch 'github/master' into phoenix

2 files changed, 23 insertions, 5 deletions

diff --git a/.config/newsbeuter/urls b/.config/newsbeuter/urls
index 756277a..a676986 100644
--- a/.config/newsbeuter/urls
+++ b/.config/newsbeuter/urls
@@ -120,11 +120,9 @@ http://www.vgcats.com/vgcats.rdf.xml comics
 http://feeds2.feedburner.com/virtualshackles comics
 http://xkcd.com/rss.xml comics
 http://feeds.feedburner.com/maximumble?format=xml comics
-http://bearmageddon.com/feed/ comics
 http://feeds.feedburner.com/ProgsLife comics
 http://www.rsspect.com/rss/asw.xml
 http://pbfcomics.com/feed/feed.xml
-http://feeds.feedburner.com/thisisindexed/SGWm
 
 #-----[ Misc ]--------------------------------------------------------
 http://wallbase.cc/rss misc
diff --git a/.offlineimaprc b/.offlineimaprc
index db46d5f..a5c8956 100644
--- a/.offlineimaprc
+++ b/.offlineimaprc
@@ -1,3 +1,5 @@
+# -*- mode: conf-unix; eval: (git-auto-commit-mode 1); -*-
+
 [general]
 # NOTE: cronjob calls the quiet UI with -u
 ui         = TTYUI
@@ -11,6 +13,7 @@ remoterepository = arch-remote
 [Account gmail]
 localrepository  = gmail-local
 remoterepository = gmail-remote
+postsynchook = mu index --muhome=~/.mu/gmail --maildir=~/documents/mail/gmail
 
 [Account iactor]
 localrepository  = iactor-local
@@ -19,14 +22,17 @@ remoterepository = iactor-remote
 [Account aethon]
 localrepository = aethon-local
 remoterepository = aethon-remote
+postsynchook = mu index --muhome=~/.mu/aethon --maildir=~/documents/mail/aethon
 
 [Account ninthfloor]
 localrepository = ninthfloor-local
 remoterepository = ninthfloor-remote
+postsynchook = mu index --muhome=~/.mu/ninthfloor --maildir=~/documents/mail/ninthfloor
 
 [Account ryuslash.org]
 localrepository = ryuslash.org-local
 remoterepository = ryuslash.org-remote
+postsynchook = mu index --muhome=~/.mu/ryuslash --maildir=~/documents/mail/ryuslash.org
 
 [Repository arch-local]
 type         = Maildir
@@ -36,6 +42,8 @@ localfolders = ~/documents/mail/arch
 type         = Maildir
 localfolders = ~/documents/mail/gmail
 
+nametrans = lambda folder: re.sub('^inbox$', 'INBOX', re.sub('^drafts$', '[Gmail]/Drafts', re.sub('^sent$', '[Gmail]/Sent Mail', re.sub('^trash$', '[Gmail]/Trash', folder))))
+
 [Repository iactor-local]
 type         = Maildir
 localfolders = ~/documents/mail/iactor
@@ -44,14 +52,21 @@ localfolders = ~/documents/mail/iactor
 type         = Maildir
 localfolders = ~/documents/mail/aethon
 
+#nametrans = lambda folder: re.sub('^inbox$', 'INBOX', re.sub('^drafts$', '[Gmail]/Concepten', re.sub('^sent$', '[Gmail]/Verzonden berichten', re.sub('^trash$', '[Gmail]/Prullenbak', folder))))
+nametrans = lambda folder: re.sub('^inbox$', 'INBOX', folder)
+
 [Repository ninthfloor-local]
 type         = Maildir
 localfolders = ~/documents/mail/ninthfloor
 
+nametrans = lambda folder: folder.capitalize()
+
 [Repository ryuslash.org-local]
 type         = Maildir
 localfolders = ~/documents/mail/ryuslash.org
 
+nametrans = lambda folder: folder.capitalize()
+
 [Repository arch-remote]
 type           = Gmail
 remoteusereval = getuser("imap.google.com-arch")
@@ -66,7 +81,8 @@ remoteusereval = getuser("imap.google.com")
 remotepasseval = getpassword("imap.google.com")
 realdelete     = no
 
-nametrans = lambda folder: re.sub('.*Spam$', 'spam', re.sub('.*Drafts$', 'drafts', re.sub('.*Sent Mail$', 'sent', re.sub('.*Starred$', 'flagged', re.sub('.*Trash$', 'trash', re.sub('.*All Mail$', 'archive', folder))))))
+folderfilter = lambda folder: folder in ['INBOX', '[Gmail]/Drafts', '[Gmail]/Sent Mail', '[Gmail]/Trash']
+nametrans = lambda folder: re.sub('^INBOX$', 'inbox', re.sub('^\[Gmail\]/Drafts$', 'drafts', re.sub('^\[Gmail\]/Sent Mail$', 'sent',  re.sub('^\[Gmail\]/Trash$', 'trash', folder))))
 
 [Repository iactor-remote]
 type           = IMAP
@@ -80,7 +96,9 @@ remoteusereval = getuser("imap.google.com-aethon")
 remotepasseval = getpassword("imap.google.com-aethon")
 realdelete     = no
 
-nametrans = lambda folder: re.sub('.*Spam$', 'spam', re.sub('.*Drafts$', 'drafts', re.sub('.*Sent Mail$', 'sent', re.sub('.*Starred$', 'flagged', re.sub('.*Trash$', 'trash', re.sub('.*All Mail$', 'archive', folder))))))
+folderfilter = lambda folder: folder in ['INBOX', '[Gmail]/Concepten', '[Gmail]/Verzonden berichten', '[Gmail]/Prullenbak']
+nametrans = lambda folder: re.sub('^INBOX$', 'inbox', folder)
+#nametrans = lambda folder: re.sub('^INBOX$', 'inbox', re.sub('^\[Gmail\]/Concepten$', 'drafts', re.sub('^\[Gmail\]/Verzonden berichten$', 'sent',  re.sub('^\[Gmail\]/Prullenbak$', 'trash', folder))))
 
 [Repository ninthfloor-remote]
 type           = IMAP
@@ -88,10 +106,12 @@ remotehost     = ninthfloor.org
 remoteusereval = getuser("ninthfloor.org")
 remotepasseval = getpassword("ninthfloor.org")
 
+nametrans = lambda folder: folder.lower()
+
 [Repository ryuslash.org-remote]
 type           = IMAP
 remotehost     = imap.alwaysdata.com
 remoteusereval = getuser("imap.alwaysdata.com")
 remotepasseval = getpassword("imap.alwaysdata.com")
 
-# vim: ft=cfg tw=0
+nametrans = lambda folder: folder.lower()