From baf3e67c9156d56be14d20ca7a3aff9f668fad8c Mon Sep 17 00:00:00 2001 From: Peng Li Date: Mon, 11 Sep 2017 16:58:34 +0800 Subject: [PATCH] evil improve --- emacs.d/emacs-evil.org | 104 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 26 deletions(-) diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index 4a0e628..b29c1bc 100644 --- a/emacs.d/emacs-evil.org +++ b/emacs.d/emacs-evil.org @@ -1,40 +1,45 @@ #+TITLE:Emacs Evil Config #+AUTHOR: Peng Li #+EMAIL: seudut@gmail.com - + As the =Evil= mode is significant, and has lots of configurations, it's better put them in a separate file. * Evil mode https://www.emacswiki.org/emacs/Evil - #+BEGIN_SRC emacs-lisp :tangle yes :results silent + (defun my-evil-insert-state-to-emacs-state (&optional arg) + "This advising function is called after `evil-insert-state', to switch to + emacs state for some modes." + (when (memq major-mode '(emacs-lisp-mode org-mode)) + (evil-emacs-state))) + (defun my-evil-config () "This should be called after evil-mode is loaded." - ;; Buffer operations - (define-key evil-normal-state-map ";w" 'evil-save) - (define-key evil-normal-state-map ";e" 'evil-edit) - ;; - ;; Window operations + + ;; default state + (setq evil-default-state 'normal) + (dolist (mode + '(org-mode emacs-lisp-mode eshell-mode)) + (evil-set-initial-state mode 'emacs)) + + (advice-add 'evil-insert-state :after #'my-evil-insert-state-to-emacs-state) + (define-key evil-normal-state-map "\C-W s" 'evil-window-split) (define-key evil-normal-state-map "\C-W v" 'evil-window-vsplit) - (define-key evil-normal-state-map ";s" 'evil-window-split) - (define-key evil-normal-state-map ";v" 'evil-window-vsplit) - (define-key evil-normal-state-map ";q" 'evil-window-delete) - (define-key evil-normal-state-map "\C-W o" 'delete-other-windows) - (define-key evil-normal-state-map "\C-W h" 'evil-window-left) - (define-key evil-normal-state-map "\C-W j" 'evil-window-down) - (define-key evil-normal-state-map "\C-W k" 'evil-window-up) - (define-key evil-normal-state-map "\C-W l" 'evil-window-right) (define-key evil-normal-state-map "\C-h" 'evil-window-left) (define-key evil-normal-state-map "\C-j" 'evil-window-down) (define-key evil-normal-state-map "\C-k" 'evil-window-up) - (define-key evil-normal-state-map "\C-l" 'evil-window-right)) + (define-key evil-normal-state-map "\C-l" 'evil-window-right) + (define-key evil-normal-state-map (kbd "C->") (lambda () (interactive) (evil-window-increase-width 3))) + (define-key evil-normal-state-map (kbd "C-<") (lambda () (interactive) (evil-window-decrease-width 3))) + (define-key evil-normal-state-map (kbd "C-+") (lambda () (interactive) (evil-window-increase-height 3))) + (define-key evil-normal-state-map (kbd "C--") (lambda () (interactive) (evil-window-decrease-height 3)))) (use-package evil :ensure t :init - (setq evil-default-state 'emacs) + ;; (setq evil-default-state 'emacs) (setq evil-emacs-state-cursor '("red" box)) (setq evil-normal-state-cursor '("green" box)) (setq evil-visual-state-cursor '("orange" box)) @@ -42,16 +47,19 @@ https://www.emacswiki.org/emacs/Evil (setq evil-replace-state-cursor '("red" bar)) (setq evil-operator-state-cursor '("red" hollow)) :config + (require 'evil-leader) + (global-evil-leader-mode) (evil-mode t) - ;; (defalias 'evil-insert-state 'evil-emacs-state) - ;; switch to normal mode - ;; (key-chord-define evil-insert-state-map "jj" 'evil-normal-state) - ;; (key-chord-define evil-emacs-state-map "jj" 'evil-normal-state) - ;; - ;; Normal state map - (my-evil-config)) - + ;; If alias insert state to emacs, there are some feature such as (column insert) not working. + ;; so disable this alias. Instead, only swith to emacs state for some special mode by advicing `evil-insert-state'. see above + ;; (defalias 'evil-inset-mode 'evil-emacs-state) + ;; escape has two define, one is interpreted as M-, the other is interpreted as ESC. This may be different between emacs GUI + ;; and terminal. + ;; Here this setting make pressing ESC alone as exit to normal state, but keep when pressing ESC with combined key, as (M-*) + (define-key evil-emacs-state-map [escape] 'evil-normal-state) + ;; (define-key evil-emacs-state-map (kbd "") 'evil-normal-state) + (my-evil-config)) #+END_SRC * Evil-escape @@ -62,11 +70,55 @@ https://www.emacswiki.org/emacs/Evil :init (setq-default evil-escape-delay 0.2) (setq-default evil-escape-key-sequence "jj") - (setq-default evil-escape-excluded-states '(emacs)) + (setq-default evil-escape-excluded-states '(normal visual motion)) + (setq-default evil-escape-excluded-major-modes '(emacs-lisp-mode org-mode)) :config (evil-escape-mode)) #+END_SRC +* Evil-Leader +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package evil-leader + :ensure t + :config + (global-evil-leader-mode) + (evil-leader/set-leader ";") + ;; Buffer & File + (evil-leader/set-key "f" 'ido-switch-buffer) + (evil-leader/set-key "w" 'evil-save) + (evil-leader/set-key "r" 'ivy-recentf) + (evil-leader/set-key "w" 'save-buffer) + (evil-leader/set-key "e" 'evil-edit) + (evil-leader/set-key "o" 'ido-find-file) + (evil-leader/set-key "p" 'projectile-find-file) + ;; Window + (evil-leader/set-key "s" 'evil-window-split) + (evil-leader/set-key "v" 'evil-window-vsplit) + (evil-leader/set-key "q" 'evil-quit) + ;; others + (evil-leader/set-key "h" 'help) + (evil-leader/set-key "h" 'help)) + +#+END_SRC + +* Evil-match +[[https://github.com/redguardtoo/evil-matchit]] +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package evil-matchit + :ensure t + :config + (global-evil-leader-mode 1)) +#+END_SRC + +* Evil-visualstar +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (use-package evil-visualstar + :ensure t + :init + (setq evil-visualstar/persistent t) + :config + (global-evil-visualstar-mode)) +#+END_SRC * Provide #+BEGIN_SRC emacs-lisp :tangle yes :results silent (provide 'init-evil-mode) -- 2.11.0