back to swiss email

4 files changed, 22 insertions, 25 deletions

diff --git a/msmtprc b/msmtprc
index 7505932..180af12 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,4 +1,4 @@
-account bitmessage 
+account default 
 host mail.bitmessage.ch
 port 465
 protocol smtp
@@ -9,9 +9,9 @@ tls on
 tls_starttls off
 tls_nocertcheck
 
-account default 
+account gmail 
 host smtp.gmail.com
-port 465
+port 587
 protocol smtp
 auth on
 from vasil.zlatanov@gmail.com
diff --git a/muttrc b/muttrc
index 1ebb758..0ff9c1a 100644
--- a/muttrc
+++ b/muttrc
@@ -15,33 +15,33 @@ set mbox_type   = Maildir
 set sendmail    = /usr/bin/msmtp
 
 set folder      = ~/.mail/
-set spoolfile   = "+Gmail/INBOX"
-set mbox        = "+Gmail/archive"
-set postponed   = "+Gmail/drafts"
-unset record
+set spoolfile   = "+Swiss/INBOX"
+#set mbox        = "+Swiss/archive"
+set postponed   = "+Swiss/INBOX.Drafts"
+set record      = "+Swiss/INBOX.Sent"
+set copy=yes
 
 mailboxes +INBOX
 
 macro index D \
-    "<save-message>+Gmail/trash<enter>" \
+    "<save-message>+Swiss/INBOX.Trash<enter>" \
     "move message to the trash"
 
-macro index S \
-    "<save-message>+Gmail/spam<enter>" \
-    "mark message as spam"
+#macro index S \
+#    "<save-message>+Swiss/INBOX.Spam<enter>" \
+#    "mark message as spam"
 
 
 # Gmail conf
-set from = "vasil.zlatanov@gmail.com"
+set from = "vasco@bitmessage.ch"
 set realname = "Vasil Zlatanov"
 
 # Change the following line to a different editor you prefer.
 set editor = "vim"
 
 # Basic config, you can leave this as is
-#set hostname = gmail.com
-set mail_check = 5
-set timeout = 15
+set mail_check = 15
+set timeout = 1
 unset imap_passive
 set header_cache=~/.muttlocal/cache/headers
 set message_cachedir=~/.muttlocal/cache/bodies
@@ -59,13 +59,10 @@ alternative_order text/plain text/html *
 auto_view text/html
 
 # Gmail-style keyboard shortcuts
-macro index,pager gi "<change-folder>=Gmail/INBOX<enter>" "Go to inbox"
-macro index,pager ga "<change-folder>=Gmail/archive<tab><enter>" "Go to all mail"
-macro index,pager gs "<change-folder>=Gmail/sent<tab><enter>" "Go to sent mail"
-macro index,pager gr "<change-folder>=Gmail/flagged<enter>" "Go to starred messages"
-macro index,pager gj "<change-folder>=Gmail/spam<enter>" "Go to spam"
-macro index,pager gt "<change-folder>=Gmail/trash<enter>" "Go to trash"
-macro index,pager gd "<change-folder>=Gmail/drafts<enter>" "Go to drafts"
+macro index,pager gi "<change-folder>=Swiss/INBOX<enter>" "Go to inbox"
+macro index,pager gs "<change-folder>=Swiss/INBOX.Sent<tab><enter>" "Go to sent mail"
+macro index,pager gt "<change-folder>=Swiss/INBOX.Trash<enter>" "Go to trash"
+macro index,pager gd "<change-folder>=Swiss/INBOX.Drafts<enter>" "Go to drafts"
 
 # Other config
 set delete 
@@ -81,6 +78,7 @@ bind index,pager "N" search-next
 bind browser d half-down
 bind index d half-down
 bind pager d half-down
+bind index D delete-message
 
 bind browser u half-up
 bind index u half-up
@@ -93,7 +91,7 @@ bind pager G        bottom
 bind index R        group-reply
 
 # Write in Aliases when opening email
-set display_filter='$HOME/.mutt/alias.sh'
+set display_filter="$HOME/.mutt/alias.sh"
 
 # Mutt LED notification 
 set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|"
diff --git a/offlineimaprc b/offlineimaprc
index ba7ee45..8dc0428 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 ui = ttyui
-accounts = Gmail
+accounts = BitMessage
 # This will suppress anything but errors
 ui = quiet
 
diff --git a/vimrc b/vimrc
index b17b703..21adce3 100644
--- a/vimrc
+++ b/vimrc
@@ -114,7 +114,6 @@ vnoremap <Tab> <Esc>gV
 onoremap <Tab> <Esc>
 inoremap <Tab> <Esc>`^
 inoremap <Leader><Tab> <Tab>
-
 set enc=utf-8
 
 "sync paste buffer and vims register