Update mail configs

6 files changed, 149 insertions, 50 deletions

diff --git a/base/mbsyncrc b/base/mbsyncrc
new file mode 100644
index 0000000..ae7f985
--- /dev/null
+++ b/base/mbsyncrc
@@ -0,0 +1,52 @@
+IMAPAccount gmail
+Host imap.gmail.com
+User jesterpm@gmail.com
+PassCmd "imap-pass -g jesterpm@gmail.com"
+SSLType IMAPS
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore gmail-remote
+Account gmail
+
+MaildirStore gmail-local
+Path ~/.maildir/
+Inbox ~/.maildir/INBOX
+
+Channel sync-gmail-default
+Master :gmail-remote:
+Slave :gmail-local:
+Patterns "INBOX"
+Expunge Both
+
+Channel sync-gmail-sent
+Master :gmail-remote:"[Gmail]/Sent Mail"
+Slave :gmail-local:sent
+Expunge Both
+
+Channel sync-gmail-trash
+Master :gmail-remote:"[Gmail]/Bin"
+Slave :gmail-local:trash
+Expunge Both
+
+Channel sync-gmail-drafts
+Master :gmail-remote:"[Gmail]/Drafts"
+Slave :gmail-local:drafts
+Expunge Both
+
+Channel sync-gmail-archive
+Master :gmail-remote:"[Gmail]/All Mail"
+Slave :gmail-local:archive
+Expunge Both
+
+Channel sync-gmail-spam
+Master :gmail-remote:"[Gmail]/Spam"
+Slave :gmail-local:spam
+Expunge Both
+
+Group gmail
+Channel sync-gmail-default
+Channel sync-gmail-sent
+Channel sync-gmail-trash
+Channel sync-gmail-drafts
+Channel sync-gmail-archive
+Channel sync-gmail-spam
diff --git a/base/msmtprc b/base/msmtprc
new file mode 100644
index 0000000..809766e
--- /dev/null
+++ b/base/msmtprc
@@ -0,0 +1,9 @@
+account default
+from jesse@jesterpm.net
+host smtp.jesterpm.net
+auth on
+user jesse@jesterpm.net
+tls
+tls_starttls off
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+logfile ~/.msmtp.log
diff --git a/base/notmuch-config b/base/notmuch-config
new file mode 100644
index 0000000..b61b264
--- /dev/null
+++ b/base/notmuch-config
@@ -0,0 +1,88 @@
+# .notmuch-config - Configuration file for the notmuch mail system
+#
+# For more information about notmuch, see https://notmuchmail.org
+
+# Database configuration
+#
+# The only value supported here is 'path' which should be the top-level
+# directory where your mail currently exists and to where mail will be
+# delivered in the future. Files should be individual email messages.
+# Notmuch will store its database within a sub-directory of the path
+# configured here named ".notmuch".
+#
+[database]
+path=/home/jesterpm/.maildir
+
+# User configuration
+#
+# Here is where you can let notmuch know how you would like to be
+# addressed. Valid settings are
+#
+#	name		Your full name.
+#	primary_email	Your primary email address.
+#	other_email	A list (separated by ';') of other email addresses
+#			at which you receive email.
+#
+# Notmuch will use the various email addresses configured here when
+# formatting replies. It will avoid including your own addresses in the
+# recipient list of replies, and will set the From address based on the
+# address to which the original email was addressed.
+#
+[user]
+name=Jesse Morgan
+primary_email=jesse@jesterpm.net
+other_email=jesterpm@u.washington.edu;
+
+# Configuration for "notmuch new"
+#
+# The following options are supported here:
+#
+#	tags	A list (separated by ';') of the tags that will be
+#		added to all messages incorporated by "notmuch new".
+#
+#	ignore	A list (separated by ';') of file and directory names
+#		that will not be searched for messages by "notmuch new".
+#
+#		NOTE: *Every* file/directory that goes by one of those
+#		names will be ignored, independent of its depth/location
+#		in the mail store.
+#
+[new]
+tags=unread;inbox;
+ignore=
+
+# Search configuration
+#
+# The following option is supported here:
+#
+#	exclude_tags
+#		A ;-separated list of tags that will be excluded from
+#		search results by default.  Using an excluded tag in a
+#		query will override that exclusion.
+#
+[search]
+exclude_tags=deleted;spam;sent
+
+# Maildir compatibility configuration
+#
+# The following option is supported here:
+#
+#	synchronize_flags      Valid values are true and false.
+#
+#	If true, then the following maildir flags (in message filenames)
+#	will be synchronized with the corresponding notmuch tags:
+#
+#		Flag	Tag
+#		----	-------
+#		D	draft
+#		F	flagged
+#		P	passed
+#		R	replied
+#		S	unread (added when 'S' flag is not present)
+#
+#	The "notmuch new" command will notice flag changes in filenames
+#	and update tags, while the "notmuch tag" and "notmuch restore"
+#	commands will notice tag changes and update flags in filenames
+#
+[maildir]
+synchronize_flags=true
diff --git a/base/offlineimap/.nolink b/base/offlineimap/.nolink
deleted file mode 100644
index e69de29..0000000
--- a/base/offlineimap/.nolink
+++ /dev/null
diff --git a/base/offlineimap/helper.py b/base/offlineimap/helper.py
deleted file mode 100644
index 9cb94d8..0000000
--- a/base/offlineimap/helper.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/python
-
-import os, subprocess,sys
-
-
-def mailpasswd(file):
-  path = os.getenv("HOME") + "/.offlineimap/" + file + ".gpg"
-  args = ["gpg", "--use-agent", "--quiet", "--batch", "-d", path]
-  try:
-    return subprocess.check_output(args).strip()
-  except subprocess.CalledProcessError:
-    return ""
-
-def prime_gpg_agent():
-  ret = False
-  i = 1
-  while not ret:
-    ret = (mailpasswd("prime") == "prime")
-    if i > 2:
-      from offlineimap.ui import getglobalui
-      sys.stderr.write("Error reading in passwords. Terminating.\n")
-      getglobalui().terminate()
-    i += 1
-  return ret
-
-prime_gpg_agent()
diff --git a/base/offlineimaprc b/base/offlineimaprc
deleted file mode 100644
index 3a864a4..0000000
--- a/base/offlineimaprc
+++ /dev/null
@@ -1,24 +0,0 @@
-[general]
-accounts = Jesterpm.net
-#pythonfile = ~/.offlineimap/helper.py
-
-[Account Jesterpm.net]
-localrepository = Local
-remoterepository = Remote
-#autorefresh = 5
-status_backend = sqlite
-
-[Repository Local]
-type = Maildir
-localfolders = ~/.maildir
-
-[Repository Remote]
-type = IMAP
-remotehost = californium.jesterpm.net
-remoteusereval = "jesterpm"
-#remotepasseval = mailpasswd("password")
-folderfilter = lambda folder: folder not in ['sent', 'search']
-ssl = yes
-maxconnections = 2
-#holdconnectionopen = false
-#idlefolders = ['INBOX', 'dc206']