Commits

Thomas Pelletier committed 5a44877 Merge

Merge.

Comments (0)

Files changed (4)

     alias hibernate='dbus-send --system --print-reply --dest="org.freedesktop.UPower" /org/freedesktop/UPower org.freedesktop.UPower.Hibernate'
 # OS X specific
 else
+    alias l='ls -1'
     alias ll='ls -C'
     # Some various binaries
     PATH="/Users/thomas/Bin:$PATH"
 oh-my-zsh = [git]git://github.com/sjl/oh-my-zsh.git
-wo = ssh://hg@bitbucket.org/pelletier/wo
+wo = https://bitbucket.org/pelletier/wo
 vim/.vim/bundle/threesome.vim = https://bitbucket.org/sjl/threesome.vim
 vim/.vim/bundle/gundo.vim = https://bitbucket.org/sjl/gundo.vim
-hg/hg-publishall = ssh://hg@bitbucket.org/pelletier/hg-publishall
+hg/hg-publishall = https://bitbucket.org/pelletier/hg-publishall
 hg/hg-prompt = https://bitbucket.org/sjl/hg-prompt
 hg/hg-git = https://bitbucket.org/durin42/hg-git
 vim/.vim/bundle/powerline = [git]git://github.com/Lokaltog/vim-powerline.git
+#-----------#
+# Passwords #
+#-----------#
+set my_gpass1=`awk '/Gmail1/ {print $2}' ~/.mutt_passwords`
+set my_gpass2=`awk '/GmailPelletier/ {print $2}' ~/.mutt_passwords`
+
+#---------------#
+# Account Hooks #
+#---------------#
+account-hook . "unset imap_user; unset imap_pass; unset tunnel" # unset first!
+account-hook        "imaps://pelletier.thomas@imap.gmail.com/" "\
+    set imap_user   = pelleter.thomas@gmail.com \
+        imap_pass   = $my_gpass1"
+account-hook        "imaps://imap.gmail.com/" "\
+    set imap_user   = thomas@pelletier.im \
+        imap_pass   = $my_gpass2"
+
+#-------------------------------------#
+# Folders, mailboxes and folder hooks #
+#-------------------------------------#
+# Setup for user1:
+set folder          = imaps://pelletier.thomas@imap.gmail.com/
+mailboxes           = +INBOX =[Gmail]/Drafts =[Gmail]/'Sent Mail' =[Gmail]/Spam =[Gmail]/Trash
+set spoolfile       = +INBOX
+folder-hook         imaps://pelletier.thomas@imap.gmail.com/ "\
+    set folder      = imaps://pelletier.thomas@imap.gmail.com/ \
+        spoolfile   = +INBOX \
+        postponed   = +[Gmail]/Drafts \
+        from        = 'Thomas Pelletier <pelletier.thomas@gmail.com> ' \
+        realname    = 'Thomas Pelletier' \
+        smtp_url    = smtps://pelletier.thomas@smtp.gmail.com \
+        smtp_pass   = $my_gpass1"
+
+# Setup for user2:
+set folder          = imaps://imap.gmail.com/
+mailboxes           = +INBOX =[Gmail]/Drafts =[Gmail]/'Sent Mail' =[Gmail]/Spam =[Gmail]/Trash
+set spoolfile       = +INBOX
+folder-hook         imaps://imap.gmail.com/ "\
+    set folder      = imaps://imap.gmail.com/ \
+        spoolfile   = +INBOX \
+        postponed   = +[Gmail]/Drafts \
+        from        = 'Thomas Pelletier <thomas@pelletier.im> ' \
+        realname    = 'Thomas Pelletier' \
+        smtp_url    = smtps://thomas@pelletier.im@smtp.gmail.com \
+        smtp_pass   = $my_gpass2"
+
+#--------#
+# Macros #
+#--------#
+macro index <F1> "y12<return><return>" # jump to mailbox number 12 (user1 inbox)
+macro index <F2> "y6<return><return>"  # jump to mailbox number 6 (user2 inbox)
+
+macro index     .i      "l((~N|~F)!~D)|(~d<1w!~Q)\n"
+macro index     .n      "l~N\n"
+macro index     .f      "l~F\n"
+macro index     .o      "l(~N|~O)\n"
+macro index     .a      "l~A\n"
+macro index     .t      "l~d<1d\n"
+macro index     .y      "l~d<2d ~d>1d\n"
+
+folder-hook     .       push '.i'
+
+#-----------------------#
+# Gmail-specific macros #
+#-----------------------#
+# to delete more than 1 message, just mark them with "t" key and then do "d" on them
+macro index d ";s+[Gmail]/Trash<enter><enter>" "Move to Gmail's Trash"
+# delete message, but from pager (opened email)
+macro pager d "s+[Gmail]/Trash<enter><enter>"  "Move to Gmail's Trash"
+# undelete messages
+macro index u ";s+INBOX<enter><enter>"         "Move to Gmail's INBOX"
+macro pager u "s+INBOX<enter><enter>"          "Move to Gmail's INBOX"
+
+#-------------------------#
+# Misc. optional settings #
+#-------------------------#
+# Check for mail every minute for current IMAP mailbox every 1 min
+set timeout         = 60
+# Check for new mail in ALL mailboxes every 2 min
+set mail_check      = 120
+# keep imap connection alive by polling intermittently (time in seconds)
+set imap_keepalive  = 300
+# allow mutt to open new imap connection automatically
+unset imap_passive
+# store message headers locally to speed things up
+# (the ~/.mutt folder MUST exist! Arch does not create it by default)
+set header_cache    = ~/.mutt/hcache
+# sort mail by threads
+set sort            = threads
+# and sort threads by date
+set sort_aux        = reverse-last-date-received
+# editor
+set editor = "vim +/^$"
+# use the reply-to: field instead of to: when replying
+set reply_to
+# also edit headers
+set edit_headers
+# remove the "old" state
+unset mark_old
+# don't record sent message: Gmail's SMTP server does that automatically.
+unset record
+
+# COLORS {{{
+#color index      color188 color237 ~A
+color index      color188 color237 ~N
+#color index      color188 color237 ~O
+color index      color174 color237 ~F
+#color index      color174 color237 ~D
+
+color status      cyan          black
+color indicator   black         yellow
+color tree        blue          black
+color error       red           black
+color hdrdefault  black         white
+color header      brightyellow  default  "^(From|Subject):"
+color header      brightcyan    default  ^To:
+color header      brightcyan    default  ^Cc:
+color index       black         red      "~F !~p !~P"
+color index       black         cyan     "~T !~F !~p !~P"
+color body        brightwhite   default  " [;:]-*[})>{(<|]
+color body        blue          default  "( *[-+=#*~_]){6,}"
+color signature   cyan          default
+color quoted      green         default
+color quoted1     yellow        default
+color quoted2     red           default
+color markers     brightred     default
+#color sidebar_new yellow        default
+# Note: I haven't written the two following rules. I don't remember where
+# I grabbed those, but I hope they have been automatically generated, because
+# they are quite scary to me.
+color body        brightyellow  default  "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
+color body        brightmagenta default  "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])"
+# }}}

iterm2/com.googlecode.iterm2.plist

Binary file modified.