X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Fconfig%2Finit-evil.el;h=8f6f01559d49560aea3c33502ba5f3cdb056517e;hb=26822a21ae3aab75b407d75dcc79f4d935fd1e95;hp=bd9b748290e3caf8f95badf7e3c45cc4292f94c7;hpb=b737119d209de265d5a48d77320db060ec56ebcf;p=dotfiles.git

diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el
index bd9b748..8f6f015 100644
--- a/emacs.d/config/init-evil.el
+++ b/emacs.d/config/init-evil.el
@@ -2,24 +2,47 @@
 ;;---------------------------------------------------------------------------------------
 ;; evil
 ;;
+
+(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)
+(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)
+
+
 (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)
+(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-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)
@@ -27,7 +50,8 @@
 
 
 ;; cursor shape
-(setq evil-emacs-state-cursor '("red" box))
+;(setq evil-emacs-state-cursor '("red" box))
+(setq evil-emacs-state-cursor '("red" bar))
 (setq evil-normal-state-cursor '("green" box))
 (setq evil-visual-state-cursor '("orange" box))
 (setq evil-insert-state-cursor '("red" bar))