X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Fconfig%2Finit-evil.el;h=3e7856e301db9fcff198210e125a3fdb96bb387a;hb=8300675f36f1b4caad5288c05d47ad4fdb5bd44b;hp=7938d72a389f8d46cb35bca1b0c327d856f0db19;hpb=f2b26a91f9fabde9f2d865457bff652e3b9bc830;p=dotfiles.git diff --git a/emacs.d/config/init-evil.el b/emacs.d/config/init-evil.el index 7938d72..3e7856e 100644 --- a/emacs.d/config/init-evil.el +++ b/emacs.d/config/init-evil.el @@ -4,6 +4,7 @@ ;; (require 'evil) + (defalias 'evil-insert-state 'evil-emacs-state) ;;https://github.com/toumorokoshi/yt.rc/blob/master/emacs/my-evil.el @@ -29,57 +30,31 @@ ;; 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 "j" 'helm-projectile-switch-to-buffer) +(evil-leader/set-key "j" 'pl-switch-buffers) (evil-leader/set-key "h" 'persp-switch) -(evil-leader/set-key "k" 'helm-find-files) -(evil-leader/set-key "ff" 'helm-ls-git-ls) -(evil-leader/set-key "fb" '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 "k" 'helm-cmd-t) +(evil-leader/set-key "b" 'helm-mini) +(evil-leader/set-key "m" 'helm-mini) -;(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 ";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 [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) -;(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-normal-state-cursor '("green" box)) (setq evil-visual-state-cursor '("orange" box)) (setq evil-insert-state-cursor '("red" bar)) (setq evil-replace-state-cursor '("red" bar)) (setq evil-operator-state-cursor '("red" hollow)) -;;Enter an emacs mode in a given state http://wikemacs.org/wiki/Evil (loop for (mode . state) in '( (nrepl-mode . insert) (pylookup-mode . emacs)