;;---------------------------------------------------------------------------------------
;; evil
;;
-(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)
-
-;; TODO: change cursor to next windows
-(evil-leader/set-key "s" 'split-window-below)
-(evil-leader/set-key "v" 'split-window-right)
-(evil-leader/set-key "q" 'delete-window)
(require 'evil)
-;(setq key-chord-two-keys-delay 0.5)
+(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)
+(define-key evil-normal-state-map "\C-p" nil)
+(define-key evil-normal-state-map "\C-n" nil)
+(define-key evil-normal-state-map "\C-k" nil)
+(define-key evil-normal-state-map "\C-l" nil)
+(define-key evil-normal-state-map "\C-k" nil)
+(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))
+
+
+
+(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)
(define-key evil-visual-state-map [escape] 'keyboard-quit)
-;(define-key minibuffer-local-map [escape] 'minibuffer-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-completion-map [escape] 'minibuffer-keyboard-quit)
;(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
(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)
(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)