From 874a24ca150bf0c3e2b0efb576aa9a72782989e6 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Wed, 3 Dec 2014 23:28:20 -0600
Subject: [PATCH] More emacs crap

---
 emacs.d/Cask    |  5 +++--
 emacs.d/init.el | 17 +++++++++++++----
 zshrc           |  4 +---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/emacs.d/Cask b/emacs.d/Cask
index 434f8de..c031505 100644
--- a/emacs.d/Cask
+++ b/emacs.d/Cask
@@ -17,6 +17,8 @@
 (depends-on "flycheck")
 (depends-on "flycheck-haskell")
 (depends-on "flycheck-hdevtools")
+(depends-on "git-commit-mode")
+(depends-on "git-rebase-mode")
 (depends-on "goto-chg")
 (depends-on "guide-key")
 (depends-on "haskell-mode")
@@ -33,7 +35,6 @@
 (depends-on "s")
 (depends-on "shut-up")
 (depends-on "slime")
-(depends-on "slime-js")
-(depends-on "slime-repl")
+(depends-on "smex")
 (depends-on "undo-tree")
 (depends-on "yasnippet")
\ No newline at end of file
diff --git a/emacs.d/init.el b/emacs.d/init.el
index f11d5dd..e89a687 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -2,13 +2,17 @@
 (require 'package)
 
 ; Cask & Pallet
-(require 'cask "/usr/local/Cellar/cask/0.7.2/cask.el") ;TODO this path sucks
+(if (file-exists-p "~/.cask/cask.el")
+    (require 'cask "~/.cask/cask.el")
+    (require 'cask "/usr/local/Cellar/cask/0.7.2/cask.el") ;TODO this path sucks
+  )
+
 (cask-initialize)
 (require 'pallet)
 (pallet-mode t)
 
 ; Evil
-(require 'evil-leader)
+;(require 'evil-leader)
 (global-evil-leader-mode)
 (evil-leader/set-leader ",")
 (evil-leader/set-key "b" 'switch-to-buffer)
@@ -49,16 +53,21 @@
 
 ; Dired
 (require 'dired-x)
+(add-hook 'dired-load-hook
+	  (function (lambda () (load "dired-x"))))
 
 ; Powerline
 ;(powerline-default-theme)
 
+; Smex
+(global-set-key (kbd "M-x") 'smex)
+(global-set-key (kbd "M-X") 'smex-major-mode-commands)
+(global-set-key (kbd "C-c C-c M-x") 'execute-extended-command)
+
 ; TODO
 ; evil-org-mode
 ; expand-region
 ; helm
-; smex
-; magit
 ; ace-jump
 ; god-mode??
 
diff --git a/zshrc b/zshrc
index 1b25279..8f78b73 100644
--- a/zshrc
+++ b/zshrc
@@ -58,6 +58,4 @@ HISTFILE=~/.history
 ### Added by the Heroku Toolbelt
 export PATH="/usr/local/heroku/bin:$PATH"
 
-# start up emacs daemon if not running
-pgrep emacs &> /dev/null || emacs --daemon
-alias emacs="emacsclient -ct"
+alias emacs='emacsclient -a "" -t'