From 91afb9e2aa119244cb4ad6cd8df19508ed5d8f2f Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Tue, 24 Jul 2018 14:39:33 +1200
Subject: [PATCH] refactor(mail): rename all instances of 'gmail' with new
 provider

---
 mail/.config/mutt/accounts/gmail     | 23 -----------------------
 mail/.config/mutt/accounts/rawlinson | 23 +++++++++++++++++++++++
 mail/.config/mutt/hooks              |  4 ++--
 mail/.config/mutt/mailboxes          | 12 ++++++------
 mail/.config/mutt/muttrc             |  2 +-
 5 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 mail/.config/mutt/accounts/gmail
 create mode 100644 mail/.config/mutt/accounts/rawlinson

diff --git a/mail/.config/mutt/accounts/gmail b/mail/.config/mutt/accounts/gmail
deleted file mode 100644
index a328f77..0000000
--- a/mail/.config/mutt/accounts/gmail
+++ /dev/null
@@ -1,23 +0,0 @@
-# clear previously defined mailboxes
-#unmailboxes *
-
-set mbox = "+gmail/Archive"
-set postponed = "+gmail/Drafts"
-set trash = "+gmail/Trash"
-unset record # gmail automatically records outgoing emails
-
-set realname = "George Rawlinson"
-set from = "george@rawlinson.net.nz"
-
-# smtp settings
-set smtp_pass= `pass mail/george@rawlinson.net.nz`
-set smtp_url=smtp://$from@smtp.gmail.com:587
-
-# gmail specific macros
-macro index A "<save-message>+gmail/Archive<enter>" "move message to the archive"
-macro index S "<save-message>+gmail/Spam<enter>" "mark message as spam"
-macro index D "<save-message>+gmail/Trash<enter>" "move message to the trash"
-# tag macros
-macro index \Ca "<tag-prefix-cond><save-message>+gmail/Archive<enter>" "move tagged messages to archive"
-macro index \Cs "<tag-prefix-cond><save-message>+gmail/Spam<enter>" "move tagged messages to spam"
-macro index \Cd "<tag-prefix-cond><save-message>+gmail/Trash<enter>" "move tagged messages to trash"
diff --git a/mail/.config/mutt/accounts/rawlinson b/mail/.config/mutt/accounts/rawlinson
new file mode 100644
index 0000000..fc1170d
--- /dev/null
+++ b/mail/.config/mutt/accounts/rawlinson
@@ -0,0 +1,23 @@
+# clear previously defined mailboxes
+#unmailboxes *
+
+set mbox = "+rawlinson/Archive"
+set postponed = "+rawlinson/Drafts"
+set trash = "+rawlinson/Trash"
+set record = "+rawlinson/Sent"
+
+set realname = "George Rawlinson"
+set from = "george@rawlinson.net.nz"
+
+# smtp settings
+set smtp_pass= `pass mail/george@rawlinson.net.nz`
+set smtp_url=smtp://$from@rawlinson.io:587
+
+# rawlinson specific macros
+macro index A "<save-message>+rawlinson/Archive<enter>" "move message to the archive"
+macro index S "<save-message>+rawlinson/Spam<enter>" "mark message as spam"
+macro index D "<save-message>+rawlinson/Trash<enter>" "move message to the trash"
+# tag macros
+macro index \Ca "<tag-prefix-cond><save-message>+rawlinson/Archive<enter>" "move tagged messages to archive"
+macro index \Cs "<tag-prefix-cond><save-message>+rawlinson/Spam<enter>" "move tagged messages to spam"
+macro index \Cd "<tag-prefix-cond><save-message>+rawlinson/Trash<enter>" "move tagged messages to trash"
diff --git a/mail/.config/mutt/hooks b/mail/.config/mutt/hooks
index 5694e3c..b4124df 100644
--- a/mail/.config/mutt/hooks
+++ b/mail/.config/mutt/hooks
@@ -1,5 +1,5 @@
 # folder hooks for different accounts
-folder-hook gmail/*       source ~/.config/mutt/accounts/gmail
+folder-hook rawlinson/*   source ~/.config/mutt/accounts/rawlinson
 folder-hook nullpointer/* source ~/.config/mutt/accounts/nullpointer
 
-source ~/.config/mutt/accounts/gmail # default account
+source ~/.config/mutt/accounts/rawlinson # default account
diff --git a/mail/.config/mutt/mailboxes b/mail/.config/mutt/mailboxes
index d9b963f..eb47eea 100644
--- a/mail/.config/mutt/mailboxes
+++ b/mail/.config/mutt/mailboxes
@@ -1,9 +1,9 @@
-mailboxes = +gmail/INBOX \
-            +gmail/Archive \
-            +gmail/Drafts \
-            +gmail/Sent \
-            +gmail/Spam \
-            +gmail/Trash \
+mailboxes = +rawlinson/INBOX \
+            +rawlinson/Archive \
+            +rawlinson/Drafts \
+            +rawlinson/Sent \
+            +rawlinson/Junk \
+            +rawlinson/Trash \
             +nullpointer/INBOX \
             +nullpointer/Archive \
             +nullpointer/Drafts \
diff --git a/mail/.config/mutt/muttrc b/mail/.config/mutt/muttrc
index 3bca302..26ed829 100644
--- a/mail/.config/mutt/muttrc
+++ b/mail/.config/mutt/muttrc
@@ -17,7 +17,7 @@ set beep_new       # beep when new mail received
 # mailbox
 set mbox_type = Maildir        # mailbox format
 set folder    = ~/.mail        # mailbox storage directory
-set spoolfile = "+gmail/INBOX" # default mailbox
+set spoolfile = "+rawlinson/INBOX" # default mailbox
 
 # ssl configuration
 set ssl_starttls  # use STARTTLS if not set