X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-evil.el;h=5dcdeb623accc2b069038df2ef256783aa12a485;hb=d62a6be2ecd4a87350fabd19acb685b359603f22;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..5dcdeb6 100644
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -4,13 +4,10 @@
 ;;
 
 (require 'evil)
+
 (defalias 'evil-insert-state 'evil-emacs-state)
-;; C-o C-o switch to normal mode, defined in config/init-key-binding.el
-;;;(global-set-key (kbd "C-o C-o") 'evil-normal-state)
 
 ;;https://github.com/toumorokoshi/yt.rc/blob/master/emacs/my-evil.el
-;; let's disable keymaps we don't want.
-;; basically, anything that uses C or M
 (define-key evil-visual-state-map "\C-w" nil)
 ;(define-key evil-normal-state-map (kbd "M-.") nil)
 (define-key evil-normal-state-map "\C-t" nil)
@@ -23,47 +20,56 @@
 (define-key evil-normal-state-map "\C-o" nil)
 
 
+;; 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))
+
+
+;; most common keys in normal-mode to swith buffer, project, windows,
+;; in emacs mode, Esc + s + x, the same
 (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-leader "s")
+(evil-leader/set-key "j" 'pl-switch-buffers)
+(evil-leader/set-key "h" 'persp-switch)
+(evil-leader/set-key "k" 'helm-cmd-t)
+;(evil-leader/set-key "f" 'helm-ls-git-ls)
+(evil-leader/set-key "b" 'helm-mini)
+(evil-leader/set-key "m" 'helm-mini)
 
-(evil-leader/set-key "s" 'split-window-below)
-(evil-leader/set-key "v" 'split-window-right)
-(evil-leader/set-key "q" 'delete-window)
 
 (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 ";s" 'split-window-below)
+(key-chord-define evil-normal-state-map ";v" 'split-window-right)
+
 (key-chord-mode 1)
 
 (define-key evil-normal-state-map [escape] 'keyboard-quit)
 (define-key evil-visual-state-map [escape] 'keyboard-quit)
 
-;(define-key minibuffer-local-map [jscape] 'minibuffer-keyboard-quit)
-;(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)
+;(define-key minibuffer-local-map [escape] 'keyboard-escape-quit)
+;(define-key minibuffer-local-ns-map [escape] 'keyboard-escape-quit)
 ;(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)
 ;(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
 ;(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
 
 
-;; 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))
 (setq evil-replace-state-cursor '("red" bar))
 (setq evil-operator-state-cursor '("red" hollow))
-;;Enter an emacs mode in a given state http://wikemacs.org/wiki/Evil
 (loop for (mode . state) in '(
                   (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,8 +77,10 @@
                   (grep-mode . emacs)
                   (bc-menu-mode . emacs)
                   (magit-branch-manager-mode . emacs)
+                  (magit-popup-mode . emacs)
                   (rdictcc-buffer-mode . emacs)
                   (dired-mode . emacs)
+                  (text-mode . emacs)
                   (wdired-mode . normal)
 ;			    (inferior-emacs-lisp-mode . emacs)
 ;			    (wdired-mode . normal)