From 996e7e2198cd77c42860e1164fec4e03c870054b Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Sat, 9 Aug 2014 01:10:18 -0400
Subject: [PATCH] more emacs like vim

---
 .emacs.d/Cask    |  9 ++++++---
 .emacs.d/init.el | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.emacs.d/Cask b/.emacs.d/Cask
index c4eea94..a1ffcea 100644
--- a/.emacs.d/Cask
+++ b/.emacs.d/Cask
@@ -1,6 +1,6 @@
 (source gnu)
-(source melpa)
 (source marmalade)
+(source melpa)
 (source org)
 
 (depends-on "ack-and-a-half")
@@ -8,21 +8,24 @@
 (depends-on "auto-complete-clang")
 (depends-on "auto-complete-clang-async")
 (depends-on "cask")
-
 (depends-on "cedit")
 (depends-on "company-go")
 (depends-on "elpy")
 (depends-on "epc")
 (depends-on "evil")
-(depends-on "neotree" :git "https://github.com/jaypei/emacs-neotree")
+(depends-on "evil-leader")
 (depends-on "exec-path-from-shell")
 (depends-on "flx-ido")
 (depends-on "flycheck")
 (depends-on "go-autocomplete")
 (depends-on "go-mode")
+(depends-on "grizzl")
 (depends-on "jedi")
+(depends-on "key-chord")
 (depends-on "magit")
+(depends-on "neotree")
 (depends-on "pallet")
 (depends-on "projectile")
+(depends-on "tabbar")
 (depends-on "yasnippet")
 (depends-on "zenburn-theme")
\ No newline at end of file
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 554c9db..524811a 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -52,6 +52,9 @@
   (exec-path-from-shell-initialize))
 
 ;; Evil!
+(require 'evil-leader)
+(global-evil-leader-mode)
+(evil-leader/set-leader ",")
 (require 'evil)
 (evil-mode 1)
 (setq evil-default-cursor t) 
@@ -68,6 +71,7 @@
 
 ;; flx-ido completion system, recommended by Projectile
 (require 'flx-ido)
+(require 'grizzl)
 (flx-ido-mode 1)
 ;; change it if you have a fast processor.
 (setq flx-ido-threshhold 1000)
@@ -75,6 +79,7 @@
 ;; Project management
 (require 'ack-and-a-half)
 (require 'projectile)
+(setq projectile-completion-system 'grizzl)
 (projectile-global-mode)
 
 ; Autocomplete
@@ -104,8 +109,23 @@
 ;; Neotree
 (require 'neotree)
 
+(require 'key-chord)
+(require 'tabbar)
 ;; Evil Key Defines
 (define-key evil-normal-state-map "gc" 'kill-buffer-and-window)
+(define-key evil-normal-state-map "gn" 'tabbar-forward-tab)
+(define-key evil-normal-state-map "gp" 'tabbar-backward-tab)
+(define-key evil-normal-state-map (kbd "C-e") 'move-end-of-line)
+(define-key evil-normal-state-map (kbd "C-a") 'move-beginning-of-line)
+(define-key evil-insert-state-map (kbd "C-e") 'move-end-of-line)
+(define-key evil-insert-state-map (kbd "C-a") 'move-beginning-of-line)
+;(setq key-chord-two-keys-delay 0.5)
+(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
+(key-chord-mode 1)
+(evil-leader/set-key 
+  "o" 'projectile-switch-to-buffer
+  "t" 'projectile-find-file
+)
 
 (load-theme 'barak t)