Working offlineimap

6 files changed, 115 insertions, 28 deletions

diff --git a/.gitignore b/.gitignore
index efdd7e6..b57f551 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 # Plugins managed by Vundle
 vim/bundle/
-vifm/Trash
+vifm/Trash/
+mutt/mutt-colors-solarized/
diff --git a/mutt/colormutt b/mutt/colormutt
index 41bf46d..a3b64d8 100644
--- a/mutt/colormutt
+++ b/mutt/colormutt
@@ -9,4 +9,4 @@ else
     theme=dark
 fi
 
-echo "/home/urbain/mutt-colors-solarized/mutt-colors-solarized-"$theme"-16.muttrc"
+echo "/home/urbain/.mutt/mutt-colors-solarized/mutt-colors-solarized-"$theme"-16.muttrc"
diff --git a/mutt/mailboxes b/mutt/mailboxes
index da3cebf..d259b41 100644
--- a/mutt/mailboxes
+++ b/mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+Gmail/INBOX" "+Gmail/[Gmail].Sent Mail" "+Imperial/INBOX" "+Imperial/Sent Items"
+mailboxes "+Gmail/Gmail" "+Hotmail/Hotmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent"
diff --git a/mutt/muttrc b/mutt/muttrc
index bc599e7..7efdffa 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,10 +1,45 @@
-# IMAP: offlineimap
+# General information
+set from             = "urbain.p.vaes@gmail.com"
+set realname         = "Urbain Vaes"
+set use_from         = yes
+set envelope_from    = "yes"
+
+# Folders
 set folder = "~/.mail"
-source ~/.mutt/mailboxes
-set spoolfile = "+account/INBOX"
-set record = "+account/Sent\ Items"
-set postponed = "+account/Drafts"
+set folder           = ~/.mail
+set alias_file       = ~/.mutt/alias
+set header_cache     = ~/.mutt/cache/headers
+set message_cachedir = ~/.mutt/cache/bodies
+set certificate_file = ~/.mutt/certificates
+set mailcap_path     = ~/.mutt/mailcap
+set tmpdir           = ~/.mutt/temp
+set signature        = ~/.mutt/sig
+
+# Maildirs
+set spoolfile = "+Main/Main"
+set record    = "+Main/Sent"
+set postponed = "+Main/Drafts"
 
+# Status Bar
+set status_chars  = " *%A"
+set status_format = "───( Folder: %f )───(%r%m messages%?n? (%n new)?%?d?\
+                     (%d to delete)?%?t? (%t tagged)? )───%>─%?p?( %p postponed )?───"
+
+# Headers
+ignore *
+unignore from: to: cc: date: subject:
+unhdr_order *
+hdr_order from: to: cc: date: subject:
+
+# Mailboxes
+mailboxes +Main/Main \
+          +Imperial/Imperial \
+          +Hotmail/Hotmail \
+          +Gmail/Gmail \
+          +Main/Sent \
+          +Main/Drafts \
+
+# Encryption
 source /usr/share/doc/mutt/examples/gpg.rc
 set pgp_use_gpg_agent = yes
 set pgp_sign_as = 08AC6A48
@@ -13,24 +48,22 @@ set crypt_autosign = no
 set crypt_replyencrypt = yes
 set fcc_clear = yes
 
-set from             = "u.vaes13@imperial.ac.uk"
-set realname         = "Urbain Vaes"
-set use_from         = yes
-set envelope_from    = "yes"
-
-# set folder           = "~/Mail"
-# set spoolfile        = /home/urbain/.mail
-# set record           = "+sent"
-# set postponed        = "+postponed"
-# set move             = no
-
-set header_cache     = ~/.mutt/cache/headers
-set message_cachedir = ~/.mutt/cache/bodies
-set certificate_file = ~/.mutt/certificates
+# Pager
+set pager_index_lines = 10 # number of index lines to show
+set pager_context = 3      # number of context lines to show
+set pager_stop             # don't go to next message automatically
+set menu_scroll            # scroll in menus
+set tilde                  # show tildes like in vim
+unset markers              # no ugly plus signs
+set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
+alternative_order text/plain text/enriched text/html
 
+# Email editing
 set editor="vim"
 set edit_headers
 set include=yes
+
+# Mail out
 set sendmail="/usr/sbin/ssmtp"
 
 # Sorting options
@@ -41,12 +74,62 @@ set sort_browser = reverse-date
 # Colorscheme for inside mutt
 source `sh /home/urbain/.mutt/colormutt`
 
-# macro index G "|fetchmail\n"
-macro index G "!fetchmail \n"
-
 # HTML messages
 auto_view text/html
 
+# Key bindings
+bind generic l select-entry
+
+bind index,browser g top-page
+bind index,browser GG bottom-page
+bind pager,index,browser \Cb previous-page
+bind pager,index,browser \Cf next-page
+
+bind index gg first-entry
+bind index G last-entry
+
+## Bindings
+# Generic
+bind generic l select-entry
+bind generic <right> select-entry
+
+# Index
+bind index l display-message
+bind index h change-folder
+bind index <right> display-message
+bind index <left> change-folder
+bind index H display-toggle-weed
+macro index , '<change-folder>!^M'
+macro index I '<tag-pattern>~N^M<tag-prefix><toggle-new><tag-prefix><tag-entry>'
+
+#       Pager
+bind    pager   j         next-line
+bind    pager   k         previous-line
+bind    pager   h         exit
+bind    pager   l         view-attachments
+bind    pager   <down>    next-line
+bind    pager   <up>      previous-line
+bind    pager   <left>    exit
+bind    pager   <right>   view-attachments
+bind    pager   H         display-toggle-weed
+macro   pager   ,         '<change-folder>!^M'
+
+# Attach 
+bind   attach   l         view-attach
+bind   attach   <right>   view-attach
+bind   attach   h         exit
+bind   attach   <left>    exit
+bind   attach   H         display-toggle-weed
+
+# Compose
+bind   compose   l         view-attach
+bind   compose   <right>   view-attach
+
+# Sidebar Navigation ---------------------------------
+bind   index,pager J sidebar-next
+bind   index,pager K sidebar-prev
+bind   index,pager O sidebar-open
+
 set reverse_alias
 alias krystle Krystle Acquah <krystle.acquah-arhin13@imperial.ac.uk>
 alias khoi Khoi Nguyen <khoi@member.fsf.org>
diff --git a/vifm/Trash b/vifm/Trash
new file mode 100644
index 0000000..008c5a9
--- /dev/null
+++ b/vifm/Trash
@@ -0,0 +1 @@
+8634
diff --git a/zshrc b/zshrc
index 102676a..107b1ac 100644
--- a/zshrc
+++ b/zshrc
@@ -89,9 +89,10 @@ alias up='cd ~/Dropbox/phd/presentations'
 alias ul='cd ~/Dropbox/phd/literature'
 alias ur='cd ~/Dropbox/phd/reports'
 alias m='mutt'
-alias f='fetchmail'
 alias a='vifm'
 alias mn='vim .mynotes'
+alias x='sh ~/.xmodmap'
+alias mail='offlineimap'
 
 # Configuration
 alias zconf='vim ~/.zshrc'
@@ -101,12 +102,13 @@ alias zaconf='vim ~/.zathurarc'
 alias tconf='vim ~/.tmux.conf'
 alias viconf='vim ~/.vifm/vifmrc'
 alias oconf='vim ~/.offlineimaprc'
+alias xconf='vim ~/.xmodmap'
 
 # Fix smart search history
 bindkey "^[[A" history-beginning-search-backward
 bindkey "^[[B" history-beginning-search-forward
 
-sleep 1
+sleep 2
 h=`date +%H`
 if [ $h -lt 9 ]; then
     xdotool key Alt+t p Down Return
@@ -117,6 +119,6 @@ else
 fi
 
 # setxkbmap -option ctrl:swapcaps
-sh ~/.xmodmap
+# sh ~/.xmodmap
 # ~/xcape/xcape -e 'Shift_L=Escape'
 # ~/xcape/xcape -e 'Shift_R=Tab'