update + gmail

6 files changed, 36 insertions, 25 deletions

diff --git a/bash_aliases b/bash_aliases
index f0ac53e..694b141 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -65,6 +65,8 @@ alias iso='dd if=/dev/cdrom of=~/cdrom_image.iso'
 alias tglxspheres='vblank_mode=0 optirun -vv /opt/VirtualGL/bin/glxspheres64'
 alias pglxspheres='vblank_mode=0 primusrun /opt/VirtualGL/bin/glxspheres64'
 alias httpserve='python -m SimpleHTTPServer'
+alias pi='ping google.com'
+alias pl='ping 8.8.8.8'
 
 
 # Screen
diff --git a/msmtprc b/msmtprc
index 180af12..74aa1fa 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,4 +1,4 @@
-account default 
+account bitmessage 
 host mail.bitmessage.ch
 port 465
 protocol smtp
@@ -9,7 +9,7 @@ tls on
 tls_starttls off
 tls_nocertcheck
 
-account gmail 
+account default 
 host smtp.gmail.com
 port 587
 protocol smtp
diff --git a/muttrc b/muttrc
index 8be11f7..d02a87d 100644
--- a/muttrc
+++ b/muttrc
@@ -15,23 +15,31 @@ set mbox_type   = Maildir
 set sendmail    = /usr/bin/msmtp
 
 set folder      = ~/.mail/
-
-set spoolfile = "+Swiss/INBOX"
-#set mbox = "+Swiss/archive"
-set postponed = "+Swiss/INBOX.Drafts"
-set record = "+Swiss/INBOX.Sent"
-set copy=yes
+set spoolfile   = "+Gmail/INBOX"
+set mbox        = "+Gmail/archive"
+set postponed   = "+Gmail/drafts"
+unset record
 
 mailboxes +INBOX
 
-# Bitmessage conf
-set from = "vasco@bitmessage.ch"
+macro index D \
+    "<save-message>+Gmail/trash<enter>" \
+    "move message to the trash"
+
+macro index S \
+    "<save-message>+Gmail/spam<enter>" \
+    "mark message as spam"
+
+
+# Gmail conf
+set from = "vasil.zlatanov@gmail.com"
 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 = 1
 set timeout = 1
 unset imap_passive
@@ -67,12 +75,13 @@ ignore x-alt-email x-orcpt company division x-warning
 
 
 # Gmail-style keyboard shortcuts
-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"
-
-
+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"
 
 # Other config
 set delete 
@@ -82,17 +91,16 @@ unset help
 set pager_stop
 
 # Bindings 
-macro index,pager d "<delete-message>"
 bind index,pager "n" next-unread
 bind index,pager "N" search-next
 
-bind browser s half-down
-bind index s half-down
-bind pager s half-down
+bind browser d half-down
+bind index d half-down
+bind pager d half-down
 
-bind browser e half-up
-bind index e half-up
-bind pager e half-up
+bind browser u half-up
+bind index u half-up
+bind pager u half-up
 
 bind index gg       first-entry
 bind pager gg       top
diff --git a/offlineimaprc b/offlineimaprc
index 6f2fe00..4fa56d4 100644
--- a/offlineimaprc
+++ b/offlineimaprc
@@ -1,6 +1,6 @@
 [general]
 ui = ttyui
-accounts = BitMessage
+accounts = Gmail
 # This will suppress anything but errors
 ui = quiet
 
diff --git a/vimperatorrc b/vimperatorrc
index 2c0c43d..5d54198 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -56,4 +56,4 @@ set gui=nonavigation
 source! /home/vasko/.vimperatorrc.local
 
 " vim: set ft=vimperator:
-set defsearch=startpage
+set defsearch=duckduckgo
diff --git a/zshrc b/zshrc
index 1250b99..7c8218f 100644
--- a/zshrc
+++ b/zshrc
@@ -27,6 +27,7 @@ export EDITOR="vim"
 export BROWSER="~/.ratposon/firesend"
 export PENTADACTYL_RUNTIME="$HOME/.pentadactyl"
 export LD_LIBRARY_PATH=/usr/local/lib
+export wiki_browser='firefox'
 
 PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}☢ "
 RPROMPT="[%{$fg_no_bold[yellow]%}%?%{$reset_color%}]"