emacs - add multi-term

[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 8f6f015..00dadb9 100644 (file)
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -22,21 +22,28 @@
 (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)))
 
-(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)
+(define-key evil-motion-state-map "\C-e" (move-end-of-line 1))
 
-(evil-leader/set-key "s" 'split-window-below)
-(evil-leader/set-key "v" 'split-window-right)
-(evil-leader/set-key "q" 'delete-window)
+(global-evil-leader-mode)
+(evil-leader/set-leader "s")
+(evil-leader/set-key "j" 'helm-mini)
+(evil-leader/set-key "k" 'helm-find-files)
 
 (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 ";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)
@@ -62,8 +69,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)