emacs - magit related change

[dotfiles.git] / emacs.d / config / init-evil.el

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index 0faabe2..b920d8f 100644 (file)
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -23,21 +23,32 @@
 (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))
+
+
+
 (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 ";s" 'split-window-below)
+;(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-define evil-normal-state-map ";;" 'helm-find-files)
 
 (key-chord-mode 1)
 
@@ -52,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))
@@ -73,8 +83,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)