From 2f0f16a4ce222b7fe4c108dec8446db74d0eb70c Mon Sep 17 00:00:00 2001
From: syl20bnr <sylvain.benner@gmail.com>
Date: Tue, 23 Apr 2013 14:05:30 -0400
Subject: [PATCH] Add subword mode hook and add back multi-term.

---
 init-package/init-multi-term.el | 3 +++
 init-package/init-subword.el    | 3 +++
 init_zsh.sh                     | 5 +++++
 my-keybindings.el               | 4 +++-
 packages.el                     | 4 +++-
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 init-package/init-multi-term.el
 create mode 100644 init-package/init-subword.el
 create mode 100644 init_zsh.sh

diff --git a/init-package/init-multi-term.el b/init-package/init-multi-term.el
new file mode 100644
index 000000000..a08bf7278
--- /dev/null
+++ b/init-package/init-multi-term.el
@@ -0,0 +1,3 @@
+(require 'multi-term)
+
+(setq multi-term-program "/bin/zsh")
diff --git a/init-package/init-subword.el b/init-package/init-subword.el
new file mode 100644
index 000000000..60ca63827
--- /dev/null
+++ b/init-package/init-subword.el
@@ -0,0 +1,3 @@
+(require 'subword)
+
+(add-hook 'prog-mode-hook 'subword-mode)
diff --git a/init_zsh.sh b/init_zsh.sh
new file mode 100644
index 000000000..944a6280d
--- /dev/null
+++ b/init_zsh.sh
@@ -0,0 +1,5 @@
+ZSH=$HOME/.oh-my-zsh
+ZSH_THEME="robbyrussell"
+plugins=(git)
+source $ZSH/oh-my-zsh.sh
+export PATH=/home/sbenner/.rbenv/shims:/home/sbenner/.rbenv/bin:/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
diff --git a/my-keybindings.el b/my-keybindings.el
index 06d9ae952..f11a544bb 100644
--- a/my-keybindings.el
+++ b/my-keybindings.el
@@ -38,7 +38,9 @@
 (evil-leader/set-key "ae" 'erc-start-or-switch)
 (evil-leader/set-key "ag" 'magit-status)
 (evil-leader/set-key "am" 'mu4e-up-to-date-status)
-(evil-leader/set-key "as" 'eshell)
+(evil-leader/set-key "ase" 'eshell)
+(evil-leader/set-key "asi" 'shell)
+(evil-leader/set-key "ast" 'multi-term)
 (evil-leader/set-key "at" 'twit)
 (evil-leader/set-key "au" 'undo-tree-visualize)
 (evil-leader/set-key "ay" 'helm-c-yas-complete)
diff --git a/packages.el b/packages.el
index 77e68b937..cedd44327 100644
--- a/packages.el
+++ b/packages.el
@@ -46,6 +46,7 @@
     magit
     markdown-mode
     move-text
+    multi-term
     nose
     org
     ;; p4
@@ -64,8 +65,9 @@
     ruby-mode
     ruby-test-mode
     smart-operator
-    sr-speedbar
+    ;; sr-speedbar
     stripe-buffer
+    subword
     surround
     tagedit
     twittering-mode