From 4edd75b6e118864450be40d4138e02fcb46a0e73 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 22 Nov 2014 05:09:53 -0800
Subject: [PATCH] updates for mu4e and erc.

---
 dotfiles/cider/bootstrap.json      |  2 ++
 dotfiles/emacs.d                   |  2 +-
 dotfiles/lib/shellenv/emacs.sh     |  4 ++++
 dotfiles/lib/shellenv/functions.sh |  6 ++++++
 dotfiles/lib/zsh.sh                |  1 +
 dotfiles/zshrc                     |  2 +-
 resources/requirements.txt         |  1 +
 tasks/__init__.py                  | 19 +++++++++++++++----
 8 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/dotfiles/cider/bootstrap.json b/dotfiles/cider/bootstrap.json
index 02166a53..a197de78 100644
--- a/dotfiles/cider/bootstrap.json
+++ b/dotfiles/cider/bootstrap.json
@@ -84,11 +84,13 @@
     "lzip",
     "make",
     "mercurial",
+    "mu",
     "netcat",
     "nettle",
     "ngrep",
     "nmap",
     "node",
+    "offline-imap",
     "openssl",
     "ossp-uuid",
     "pandoc",
diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 82a439cd..465abf6d 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 82a439cd2f06b4e111dd347d5f6afef023896e07
+Subproject commit 465abf6de2f36015d8e241ce70cdc1fde294e357
diff --git a/dotfiles/lib/shellenv/emacs.sh b/dotfiles/lib/shellenv/emacs.sh
index c06c1261..b223b462 100644
--- a/dotfiles/lib/shellenv/emacs.sh
+++ b/dotfiles/lib/shellenv/emacs.sh
@@ -70,6 +70,10 @@ function emacs_open {
     focus_emacs
 }
 
+function time_emacs {
+    time \emacs --daemon="timing" && emacsclient -e "(kill-emacs)" --server-file="timing"
+}
+
 # Make emacs the default editor.
 export EDITOR='emacs_open'
 export VISUAL="$EDITOR"
diff --git a/dotfiles/lib/shellenv/functions.sh b/dotfiles/lib/shellenv/functions.sh
index 28fa98dc..f815e55e 100644
--- a/dotfiles/lib/shellenv/functions.sh
+++ b/dotfiles/lib/shellenv/functions.sh
@@ -270,3 +270,9 @@ function track_modified {
 function python_module_path {
     python -c "import os, $1; print(os.path.dirname($1.__file__))"
 }
+
+function mu4e_directory {
+    if is_osx; then
+	echo "$(brew --prefix mu)/share/emacs/site-lisp/mu4e"
+    fi
+}
diff --git a/dotfiles/lib/zsh.sh b/dotfiles/lib/zsh.sh
index 3990be48..32976b53 100644
--- a/dotfiles/lib/zsh.sh
+++ b/dotfiles/lib/zsh.sh
@@ -3,6 +3,7 @@ for filename in ~/.lib/zsh/*; do
 done
 
 alias srczsh="source ~/.zshrc"
+alias zshenv="source ~/.zshenv"
 
 # Online help.
 unalias run-help 2> /dev/null 1>/dev/null
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index b9a925c2..d930b543 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -2,4 +2,4 @@
 source ~/.lib/shellrc.sh
 [[ $TERM == "dumb" ]] && unsetopt zle && PS1='$ ' && return
 source ~/.lib/zsh.sh
-test -r ~/custom.zsh && source ~/custom.zsh
+test -r ~/.custom.sh && source ~/.custom.sh
diff --git a/resources/requirements.txt b/resources/requirements.txt
index 3e0e6061..eb20bcdc 100644
--- a/resources/requirements.txt
+++ b/resources/requirements.txt
@@ -16,3 +16,4 @@ Flask
 flake8
 pylint
 coloredlogs
+dropbox
diff --git a/tasks/__init__.py b/tasks/__init__.py
index 69599dd3..4ef4f89f 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -34,6 +34,18 @@ def dotfiles(ctx, flags=''):
     return ctx.run('dotfiles -s{1} -R {0}'.format(DOTFILES_DIRECTORY, flags))
 
 
+@ctask
+def dropbox_dotfiles(ctx, flags='f'):
+    ctx.run('hash dotfiles || sudo pip install dotfiles')
+    link_dropbox_other(ctx)
+    ctx.run('dotfiles -s{1} -R {0}'.format(
+        os.path.join(
+            os.path.expanduser('~'), 'Dropbox', 'configs', 'dotfiles'
+        ),
+        flags
+    ))
+
+
 @ctask
 def powerline(ctx):
     ctx.run('sudo pip install psutil')
@@ -66,12 +78,11 @@ def change_shell(ctx):
 
 
 @ctask
-def link_dropbox(ctx):
+def link_dropbox_other(ctx):
     link_pairs = (
         ('~/Dropbox/configs/custom.el', '~/.emacs.d/custom.el'),
-        ('~/Dropbox/configs/custom.zsh', '~/custom.zsh'),
         ('~/Dropbox/Documents', '~/Documents'),
-        ('~/Dropbox/Pictures', '~/Pictures'),
+        ('~/Dropbox/Pictures', '~/Pictures')
     )
     for source, destination in link_pairs:
         destination = os.path.expanduser(destination)
@@ -99,7 +110,7 @@ ns.add_task(customize_user_settings)
 ns.add_task(dotfiles)
 ns.add_task(install_npm_libraries)
 ns.add_task(install_python_libraries)
-ns.add_task(link_dropbox)
+ns.add_task(dropbox_dotfiles)
 ns.add_task(powerline)
 ns.add_task(setup)
 ns.add_task(vimstall)