Add ninthfloor and ryuslash.org accounts

Also forces the use of tls.

3 files changed, 60 insertions, 28 deletions

diff --git a/.mutt/muttrc b/.mutt/muttrc
index ebcc001..b21fae9 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -9,26 +9,26 @@ set message_cachedir = ~/.mutt/cache/bodies  # where to store bodies
 set certificate_file = ~/.mutt/certificates  # where to store certs
 set mailcap_path     = ~/.mutt/mailcap       # entries for filetypes
 set tmpdir           = ~/.mutt/temp          # where to keep temp files
-set editor           = "emacs -nw" # "/usr/bin/vim +/^$"   # use vim and skip to first blank
-                                             # line
+set editor           = "emacs -nw"
 
 # main options
-set mbox_type  = Maildir          # mailbox type
-set folder     = ~/documents/mail # mailbox location
-set spoolfile  = "+gmail/INBOX"   # gmail is the default inbox
-set timeout    = 3                # idle time before scanning
-set mail_check = 0                # minimum time between scans
-set sort_alias = alias            # sort alias file by alias
-set reverse_alias                 # show names from alias file in index
-unset move                        # gmail does that
-set delete                        # don't ask, just do
-unset confirmappend               # don't ask, just do!
-set quit                          # don't ask, just do!!
-unset mark_old                    # read/new is good enough for me
-set beep_new                      # bell on new mails
-set pipe_decode                   # strip headers and eval mimes when piping
-set thorough_search               # strip headers and eval mimes before searching
+set mbox_type  = Maildir               # mailbox type
+set folder     = ~/documents/mail      # mailbox location
+set spoolfile  = "+ryuslash.org/INBOX" # ryuslash.org is the default inbox
+set timeout    = 3                     # idle time before scanning
+set mail_check = 0                     # minimum time between scans
+set sort_alias = alias                 # sort alias file by alias
+set reverse_alias                      # show names from alias file in index
+unset move                             # gmail does that
+set delete                             # don't ask, just do
+unset confirmappend                    # don't ask, just do!
+set quit                               # don't ask, just do!!
+unset mark_old                         # read/new is good enough for me
+set beep_new                           # bell on new mails
+set pipe_decode                        # strip headers and eval mimes when piping
+set thorough_search                    # strip headers and eval mimes before searching
 #set ascii_chars = yes
+set ssl_force_tls = yes
 
 # index options
 set sort     = threads            # like gmail
@@ -84,17 +84,21 @@ mailboxes +arch/INBOX #+arch/archive +arch/sent +arch/drafts +arch/spam +arch/tr
 mailboxes +gmail/INBOX #+gmail/archive +gmail/sent +gmail/drafts +gmail/spam +gmail/trash
 mailboxes +iactor/INBOX #+iactor/INBOX.Admin +iactor/INBOX.Important +iactor/INBOX.Intern +iactor/INBOX.Taken +iactor/Sent +iactor/Drafts +iactor/Trash
 mailboxes +aethon/INBOX
+mailboxes +ninthfloor/INBOX
+mailboxes +ryuslash.org/INBOX
 
 # always sourced
-source $alias_file            # required for functionality
-source ~/.mutt/colors.muttrc  # source colors file
-source ~/.mutt/gmail.muttrc    # source arch as default
+source $alias_file                 # required for functionality
+source ~/.mutt/colors.muttrc       # source colors file
+source ~/.mutt/ryuslash.org.muttrc # source arch as default
 
 # account specific sources
-folder-hook arch/*   source ~/.mutt/arch.muttrc
-folder-hook gmail/*  source ~/.mutt/gmail.muttrc
-folder-hook iactor/* source ~/.mutt/iactor.muttrc
-folder-hook aethon/* source ~/.mutt/aethon.muttrc
+folder-hook arch/*         source ~/.mutt/arch.muttrc
+folder-hook gmail/*        source ~/.mutt/gmail.muttrc
+folder-hook iactor/*       source ~/.mutt/iactor.muttrc
+folder-hook aethon/*       source ~/.mutt/aethon.muttrc
+folder-hook ninthfloor/*   source ~/.mutt/ninthfloor.muttrc
+folder-hook ryuslash.org/* source ~/.mutt/ryuslash.org.muttrc
 
 # abook
 set query_command = "abook --mutt-query '%s'"
@@ -104,10 +108,12 @@ macro index I "<change-folder>!<enter>"                         "go to Inbox"
 macro index Z "<shell-escape>/usr/bin/offlineimap -q -o<enter>" "sync IMAP"
 macro generic,index,pager \ca "<shell-escape>abook<return>" "launch abook"
 macro index,pager A "<pipe-message>abook --add-email<return>" "add the sender address to abook"
-macro generic,index,pager <ESC>1 "<change-folder>=gmail/INBOX<return>"  "Show gmail inbox"
-macro generic,index,pager <ESC>2 "<change-folder>=arch/INBOX<return>"   "Show arch inbox"
-macro generic,index,pager <ESC>3 "<change-folder>=aethon/INBOX<return>" "Show aethon inbox"
-macro generic,index,pager <ESC>4 "<change-folder>=iactor/INBOX<return>" "Show iactor inbox"
+macro generic,index,pager <ESC>1 "<change-folder>=ryuslash.org/INBOX<return>" "Show ryuslash.org inbox"
+macro generic,index,pager <ESC>2 "<change-folder>=gmail/INBOX<return>"        "Show gmail inbox"
+macro generic,index,pager <ESC>3 "<change-folder>=arch/INBOX<return>"         "Show arch inbox"
+macro generic,index,pager <ESC>4 "<change-folder>=aethon/INBOX<return>"       "Show aethon inbox"
+macro generic,index,pager <ESC>5 "<change-folder>=ninthfloor/INBOX<return>"   "Show ninthfloor inbox"
+macro generic,index,pager <ESC>6 "<change-folder>=iactor/INBOX<return>"       "Show iactor inbox"
 
 # key bindings
 bind pager \177 previous-line # default didn't want to work anymore
diff --git a/.mutt/ninthfloor.muttrc b/.mutt/ninthfloor.muttrc
new file mode 100644
index 0000000..bda1c26
--- /dev/null
+++ b/.mutt/ninthfloor.muttrc
@@ -0,0 +1,13 @@
+###
+# ninthfloor specific options
+###
+
+set from = "ryuslash@ninthfloor.org"
+set smtp_url = "smtps://ryuslash@ninthfloor.org"
+set mbox = "+ninthfloor/INBOX"
+set record = "+ninthfloor/Sent"
+set postponed = "+ninthfloor/Drafts"
+unset signature
+
+macro index E "<change-folder>+ninthfloor/INBOX<enter><limit>~B " "search everything"
+macro index D "<save-message>+ninthfloor/Trash<enter>"            "move message to the trash"
diff --git a/.mutt/ryuslash.org.muttrc b/.mutt/ryuslash.org.muttrc
new file mode 100644
index 0000000..6a5aaa1
--- /dev/null
+++ b/.mutt/ryuslash.org.muttrc
@@ -0,0 +1,13 @@
+###
+# ryuslash.org specific options
+###
+
+set from = "tom@ryuslash.org"
+set smtp_url = "smtp://tom@ryuslash.org@smtp.alwaysdata.com:587"
+set mbox = "+ryuslash.org/INBOX"
+set record = "+ryuslash.org/Sent"
+set postponed = "+ryuslash.org/Drafts"
+unset signature
+
+macro index E "<change-folder>+ryuslash.org/INBOX<enter><limit>~B " "search everything"
+macro index D "<save-message>+ninthfloor/Trash<enter>"              "move message to the trash"