7 files changed, 159 insertions, 53 deletions
diff --git a/mbsync/.mbsyncrc b/mbsync/.mbsyncrc
index 2cde563..52b6cd8 100644
--- a/mbsync/.mbsyncrc
+++ b/mbsync/.mbsyncrc
@@ -48,7 +48,7 @@ Channel gmail-sent
 #######################################
 
 IMAPAccount ohmnii
-Host imap.mail.us-east-1.awsapps.com
+Host banshee.mxlogin.com
 User tucker@ohmnii.com
 PassCmd "pass show email/ohmnii.com"
 SSLType IMAPS
@@ -66,11 +66,11 @@ Master :ohmnii-remote:
 Slave :ohmnii-local:inbox
 
 Channel ohmnii-sent
-Master :ohmnii-remote:"Sent Items"
+Master :ohmnii-remote:"Sent"
 Slave :ohmnii-local:sent
 
 #Channel ohmnii-trash
-#Master :ohmnii-remote:"Deleted Items"
+#Master :ohmnii-remote:"Trash"
 #Slave :ohmnii-local:trash
 
 #Channel ohmnii-archive
@@ -177,52 +177,114 @@ Group clarkson
 Channel clarkson-default
 Channel clarkson-sent
 
-###################
-# tuckerevans.com #
-###################
+#######################
+# tje tuckerevans.com #
+#######################
 
-IMAPAccount tuckerevans
+IMAPAccount tje-tuckerevans
 Host banshee.mxlogin.com
 User tje@tuckerevans.com
-PassCmd "pass show email/tuckerevans.com"
+PassCmd "pass show email/tje.tuckerevans.com"
 SSLType IMAPS
 Port 993
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
-IMAPStore tuckerevans-remote
-Account tuckerevans
+IMAPStore tje-tuckerevans-remote
+Account tje-tuckerevans
+
+MaildirStore tje-tuckerevans-local
+Path ~/Mail/tuckerevans/tje/
+Inbox ~/Mail/tuckerevans/tje/inbox
+
+Channel tje-tuckerevans-default
+Master :tje-tuckerevans-remote:
+Slave :tje-tuckerevans-local:inbox
+
+Channel tje-tuckerevans-sent
+Master :tje-tuckerevans-remote:"Sent"
+Slave :tje-tuckerevans-local:sent
+
+Channel tje-tuckerevans-notes
+Master :tje-tuckerevans-remote:"Notes"
+Slave :tje-tuckerevans-local:notes
+
+#Channel tje-tuckerevans-trash
+#Master :tje-tuckerevans-remote:"Trash"
+#Slave :tje-tuckerevans-local:trash
+
+#Channel tje-tuckerevans-archive
+#Master :tje-tuckerevans-remote:"Archives"
+#Slave :tje-tuckerevans-local:all
+
+#Channel tje-tuckerevans-junk
+#Master :tje-tuckerevans-remote:"spam"
+#Slave :tje-tuckerevans-local:junk
+
+Create Both
+Expunge Both
+SyncState *
+
+Group tje-tuckerevans
+Channel tje-tuckerevans-default
+#Channel tje-tuckerevans-trash
+#Channel tje-tuckerevans-archive
+Channel tje-tuckerevans-sent
+Channel tje-tuckerevans-notes
+#Channel tje-tuckerevans-junk
+
+
+
+##########################
+# tucker tuckerevans.com #
+##########################
+
+IMAPAccount tucker-tuckerevans
+Host banshee.mxlogin.com
+User tucker@tuckerevans.com
+PassCmd "pass show email/tucker.tuckerevans.com"
+SSLType IMAPS
+Port 993
+CertificateFile /etc/ssl/certs/ca-certificates.crt
+
+IMAPStore tucker-tuckerevans-remote
+Account tucker-tuckerevans
+
+MaildirStore tucker-tuckerevans-local
+Path ~/Mail/tuckerevans/tucker/
+Inbox ~/Mail/tuckerevans/tucker/inbox
 
-MaildirStore tuckerevans-local
-Path ~/Mail/tuckerevans/
-Inbox ~/Mail/tuckerevans/inbox
+Channel tucker-tuckerevans-default
+Master :tucker-tuckerevans-remote:
+Slave :tucker-tuckerevans-local:inbox
 
-Channel tuckerevans-default
-Master :tuckerevans-remote:
-Slave :tuckerevans-local:inbox
+Channel tucker-tuckerevans-sent
+Master :tucker-tuckerevans-remote:"Sent"
+Slave :tucker-tuckerevans-local:sent
 
-Channel tuckerevans-sent
-Master :tuckerevans-remote:"Sent"
-Slave :tuckerevans-local:sent
+#Channel tucker-tuckerevans-notes
+#Master :tucker-tuckerevans-remote:"Notes"
+#Slave :tucker-tuckerevans-local:notes
 
-#Channel tuckerevans-trash
-#Master :tuckerevans-remote:"Trash"
-#Slave :tuckerevans-local:trash
+#Channel tucker-tuckerevans-trash
+#Master :tucker-tuckerevans-remote:"Trash"
+#Slave :tucker-tuckerevans-local:trash
 
-#Channel tuckerevans-archive
-#Master :tuckerevans-remote:"Archives"
-#Slave :tuckerevans-local:all
+#Channel tucker-tuckerevans-archive
+#Master :tucker-tuckerevans-remote:"Archives"
+#Slave :tucker-tuckerevans-local:all
 
-#Channel tuckerevans-junk
-#Master :tuckerevans-remote:"spam"
-#Slave :tuckerevans-local:junk
+#Channel tucker-tuckerevans-junk
+#Master :tucker-tuckerevans-remote:"spam"
+#Slave :tucker-tuckerevans-local:junk
 
 Create Both
 Expunge Both
 SyncState *
 
-Group tuckerevans
-Channel tuckerevans-default
-#Channel tuckerevans-trash
-#Channel tuckerevans-archive
-Channel tuckerevans-sent
-#Channel tuckerevans-junk
+Group tucker-tuckerevans
+Channel tucker-tuckerevans-default
+#Channel tucker-tuckerevans-trash
+#Channel tucker-tuckerevans-archive
+Channel tucker-tuckerevans-sent
+Channel tucker-tuckerevans-notes
+#Channel tucker-tuckerevans-junk
diff --git a/msmtp/.msmtprc b/msmtp/.msmtprc
index 6813c12..327a02c 100644
--- a/msmtp/.msmtprc
+++ b/msmtp/.msmtprc
@@ -14,7 +14,7 @@ user "tuckerevans24"
 passwordeval "pass show google_app_passwords/msmtp"
 
 account ohmnii
-host smtp.mail.us-east-1.awsapps.com
+host banshee.mxlogin.com
 from "tucker@ohmnii.com"
 port 465
 tls on
@@ -43,11 +43,20 @@ tls_starttls on
 user "evanst@clarkson.edu"       
 passwordeval "pass show clarkson/app-passwords/msmtp"
 
-account tuckerevans
+account tje-tuckerevans
 host banshee.mxlogin.com
 from "tje@tuckerevans.com"
 port 465
 tls on
 tls_starttls off
 user "tje@tuckerevans.com"
-passwordeval "pass show email/tuckerevans.com"
+passwordeval "pass show email/tje.tuckerevans.com"
+
+account tucker-tuckerevans
+host banshee.mxlogin.com
+from "tucker@tuckerevans.com"
+port 465
+tls on
+tls_starttls off
+user "tucker@tuckerevans.com"
+passwordeval "pass show email/tucker.tuckerevans.com"
diff --git a/mutt/.mutt/ohmnii.com b/mutt/.mutt/ohmnii.com
index 0f410c6..26048cf 100644
--- a/mutt/.mutt/ohmnii.com
+++ b/mutt/.mutt/ohmnii.com
@@ -9,3 +9,7 @@ set spoolfile="~/Mail/ohmnii/inbox"
 set sendmail="/usr/bin/msmtp -a ohmnii"
 
 color status black green
+
+set alias_file= ~/.mutt/alias.ohmnii.com
+source $alias_file
+
diff --git a/mutt/.mutt/tje.tuckerevans.com b/mutt/.mutt/tje.tuckerevans.com
new file mode 100644
index 0000000..c8c9931
--- /dev/null
+++ b/mutt/.mutt/tje.tuckerevans.com
@@ -0,0 +1,14 @@
+set from="Tucker Evans <tje@tuckerevans.com>"
+set hostname="tuckerevans.com"
+set folder="~/Mail/tuckerevans/tje"
+set mbox="~/Mail/tuckerevans/tje"
+set record="~/Mail/tuckerevans/tje/sent"
+set postponed="~/Mail/tuckerevans/tje/drafts"
+set spoolfile="~/Mail/tuckerevans/tje/inbox"
+
+set sendmail="/usr/bin/msmtp -a tje-tuckerevans"
+
+color status black cyan
+
+set alias_file = ~/.mutt/alias.tuckerevans.com
+source $alias_file
diff --git a/mutt/.mutt/tucker.tuckerevans.com b/mutt/.mutt/tucker.tuckerevans.com
new file mode 100644
index 0000000..5c4dc1e
--- /dev/null
+++ b/mutt/.mutt/tucker.tuckerevans.com
@@ -0,0 +1,14 @@
+set from="Tucker Evans <tucker@tuckerevans.com>"
+set hostname="tuckerevans.com"
+set folder="~/Mail/tuckerevans/tucker"
+set mbox="~/Mail/tuckerevans/tucker"
+set record="~/Mail/tuckerevans/tucker/sent"
+set postponed="~/Mail/tuckerevans/tucker/drafts"
+set spoolfile="~/Mail/tuckerevans/tucker/inbox"
+
+set sendmail="/usr/bin/msmtp -a tucker-tuckerevans"
+
+color status black magenta
+
+set alias_file = ~/.mutt/alias.tuckerevans.com
+source $alias_file
diff --git a/mutt/.mutt/tuckerevans.com b/mutt/.mutt/tuckerevans.com
deleted file mode 100644
index 5a6c965..0000000
--- a/mutt/.mutt/tuckerevans.com
+++ /dev/null
@@ -1,11 +0,0 @@
-set from="Tucker Evans <tje@tuckerevans.com>"
-set hostname="tuckerevans.com"
-set folder="~/Mail/tuckerevans"
-set mbox="~/Mail/tuckerevans"
-set record="~/Mail/tuckerevans/sent"
-set postponed="~/Mail/tuckerevans/drafts"
-set spoolfile="~/Mail/tuckerevans/inbox"
-
-set sendmail="/usr/bin/msmtp -a tuckerevans"
-
-color status black cyan
diff --git a/mutt/.muttrc b/mutt/.muttrc
index 4646224..2765e81 100644
--- a/mutt/.muttrc
+++ b/mutt/.muttrc
@@ -47,15 +47,17 @@ alternative_order text/plain text/enriched text/html
 folder-hook '~/Mail/gmail.com' 'source ~/.mutt/gmail.com'
 folder-hook '~/Mail/ohmnii.com/inbox' 'source ~/mutt/ohmnii.com'
 folder-hook '~/Mail/landmark.edu' 'source ~/mutt/landmark.edu'
-folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu
-folder-hook '~/Mail/tuckerevans.com/inbox' 'source ~/mutt/tuckerevans.com'
+folder-hook '~/Mail/clarkson.edu' 'source ~/mutt/clarkson.edu'
+folder-hook '~/Mail/tuckerevans.com/tje/inbox' 'source ~/mutt/tje.tuckerevans.com'
+folder-hook '~/Mail/tuckerevans.com/tucker/inbox' 'source ~/mutt/tucker.tuckerevans.com'
 
 
 macro index <f1> '<sync-mailbox><change-folder>~/Mail/gmail/inbox<enter><enter-command>source ~/.mutt/gmail.com<enter>'
 macro index <f2> '<sync-mailbox><change-folder>~/Mail/ohmnii/inbox<enter><enter-command>source ~/.mutt/ohmnii.com<enter>'
-macro index <f3> '<sync-mailbox><change-folder>~/Mail/tuckerevans/inbox<enter><enter-command>source ~/.mutt/tuckerevans.com<enter>'
-macro index <f4> '<sync-mailbox><change-folder>~/Mail/clarkson/inbox<enter><enter-command>source ~/.mutt/clarkson.edu<enter>'
-macro index <f5> '<sync-mailbox><change-folder>~/Mail/landmark/inbox<enter><enter-command>source ~/.mutt/landmark.edu<enter>'
+macro index <f3> '<sync-mailbox><change-folder>~/Mail/tuckerevans/tje/inbox<enter><enter-command>source ~/.mutt/tje.tuckerevans.com<enter>'
+macro index <f4> '<sync-mailbox><change-folder>~/Mail/tuckerevans/tucker/inbox<enter><enter-command>source ~/.mutt/tucker.tuckerevans.com<enter>'
+macro index <f5> '<sync-mailbox><change-folder>~/Mail/clarkson/inbox<enter><enter-command>source ~/.mutt/clarkson.edu<enter>'
+macro index <f6> '<sync-mailbox><change-folder>~/Mail/landmark/inbox<enter><enter-command>source ~/.mutt/landmark.edu<enter>'
 
 # -*-muttrc-*-
 
@@ -80,6 +82,18 @@ color index brightwhite black "~N|~O"
 color body brightwhite black '\*+[^*]+\*+'
 color body brightwhite black '_+[^_]+_+'
 
+set include
 
 #default mailbox
 source ~/.mutt/gmail.com
+
+bind pager j next-line
+bind pager k previous-line
+bind pager gg top
+bind pager G bottom
+
+bind index N search-opposite
+bind pager N search-opposite
+
+bind browser gg first-entry
+bind browser G last-entry