X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-evil.el;h=549c4d1dcae2df77a37f27f0beb3d4aa2a8cd8f2;hb=ed0f4ed4fd3b9c5af7d4c10bd6d5c734ab61b269;hp=00dadb9fb37bd597b2e5b4941054ded1817905b0;hpb=16e93b23ce9b8bf9a9ed04181f8bbf6ff03b16c0;p=dotfiles.git

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 00dadb9..549c4d1 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)
@@ -22,27 +19,41 @@
 (define-key evil-normal-state-map "\C-j" nil)
 (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 "s")
-(evil-leader/set-key "j" 'helm-mini)
-(evil-leader/set-key "k" 'helm-find-files)
+(evil-leader/set-key "j" 'helm-projectile-switch-to-buffer)
+(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 "j" 'helm-mini)
+;(evil-leader/set-key "p" 'helm-projectile-switch-project)
+
+;(define-key evil-normal-state-map "M-n" 'persp-next)
+;(define-key evil-normal-state-map "\M-p" 'persp-prev)
+
+
+;(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 ";w" 'save-buffer)
 (key-chord-define evil-normal-state-map ";s" '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-define evil-normal-state-map ";;" 'helm-find-files)
 
 (key-chord-mode 1)
 
@@ -56,9 +67,14 @@
 ;(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
 
 
+
+;; implement some missing vim normal command
+;; g-; - goto last change
+;; g
+
+
 ;; 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))
@@ -78,8 +94,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)