X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-evil.el;h=5067725b8dfb8aa6ffb86cff3f1636d314f1d756;hb=2092437bab4c6654047b36f517382e569ad32283;hp=8f6f01559d49560aea3c33502ba5f3cdb056517e;hpb=595ca2fc90980bb1d776c84e00184d4ea24d87bf;p=dotfiles.git

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 8f6f015..5067725 100644
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -23,20 +23,33 @@
 (define-key evil-normal-state-map "\C-o" nil)
 
 
-(global-evil-leader-mode)
-(evil-leader/set-leader ";")
-(evil-leader/set-key "e" 'find-file)
-(evil-leader/set-key "b" 'switch-to-buffer)
-(evil-leader/set-key "w" 'evil-write)
 
-(evil-leader/set-key "s" 'split-window-below)
-(evil-leader/set-key "v" 'split-window-right)
-(evil-leader/set-key "q" 'delete-window)
+
+;; M-e not works correctly in evil-normal mode, this fix it
+(define-key evil-normal-state-map "\M-e" (lambda() (interactive)
+					   (forward-sentence 2)))
+(define-key evil-motion-state-map "\C-e" (move-end-of-line 1))
+
+
+
+(global-evil-leader-mode)
+(evil-leader/set-leader "s")
+(evil-leader/set-key "j" 'helm-mini)
+(evil-leader/set-key "k" 'helm-find-files)
+(evil-leader/set-key "h" 'persp-switch)
+(evil-leader/set-key "l" 'persp-switch)
+(evil-leader/set-key "g" 'persp-switch)
 
 (setq key-chord-two-keys-delay 0.5)
 (key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
 (key-chord-define evil-emacs-state-map "jj" 'evil-normal-state)
 
+
+;(key-chord-define evil-normal-state-map ";w" 'save-buffer)
+;(key-chord-define evil-normal-state-map "ss" 'split-window-below)
+(key-chord-define evil-normal-state-map ";v" 'split-window-right)
+;(key-chord-define evil-normal-state-map ";;" 'helm-find-files)
+
 (key-chord-mode 1)
 
 (define-key evil-normal-state-map [escape] 'keyboard-quit)
@@ -50,8 +63,7 @@
 
 
 ;; cursor shape
-;(setq evil-emacs-state-cursor '("red" box))
-(setq evil-emacs-state-cursor '("red" bar))
+(setq evil-emacs-state-cursor '("red" box))
 (setq evil-normal-state-cursor '("green" box))
 (setq evil-visual-state-cursor '("orange" box))
 (setq evil-insert-state-cursor '("red" bar))
@@ -62,8 +74,8 @@
                   (nrepl-mode . insert)
                   (pylookup-mode . emacs)
                   (comint-mode . normal)
-                  (shell-mode . insert)
-                  (git-commit-mode . insert)
+                  (shell-mode . emacs)
+                  (git-commit-mode . emacs)
                   (git-rebase-mode . emacs)
                   (term-mode . emacs)
                   (help-mode . emacs)
@@ -71,6 +83,7 @@
                   (grep-mode . emacs)
                   (bc-menu-mode . emacs)
                   (magit-branch-manager-mode . emacs)
+                  (magit-popup-mode . emacs)
                   (rdictcc-buffer-mode . emacs)
                   (dired-mode . emacs)
                   (wdired-mode . normal)