X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=9b53be7964ecd540229720b61ef51bf5639bd867;hb=33ae631ee61dac5ec34c09ab63ea735ae68c62b8;hp=b29c1bc36f56820e932e9aca26612164c489bdd0;hpb=baf3e67c9156d56be14d20ca7a3aff9f668fad8c;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index b29c1bc..9b53be7 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -6,42 +6,17 @@ As the =Evil= mode is significant, and has lots of configurations, it's better p
 in a separate file.
 
 * Evil mode 
-https://www.emacswiki.org/emacs/Evil
+** Install and basic config
+https://www.emacswiki.org/emacs/Evil.
+=global-evil-leader-mode= should be set before =evil-mode=.
 #+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."
-    
-    ;; 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 "\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 (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-emacs-state-cursor '("red" box))
     (setq evil-normal-state-cursor '("green" box))
+    (setq evil-motion-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))
@@ -49,19 +24,35 @@ https://www.emacswiki.org/emacs/Evil
     :config
     (require 'evil-leader)
     (global-evil-leader-mode)
-    (evil-mode t)
-    ;; 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-*)
+    (evil-mode t))
+#+END_SRC
+
+** Initial mode and state config
+- Use =normal= as the default state but exclude some special modes.
+- Bind =[escape]=  to =normal= mode. This only works on GUI Emacs. If need to work on Terminal, shoudl also bind =(kbd
+  "<ESC>)=, but this will make the combined key =M-= not wor.
+- Not alias =insert= state to =emacs= state, as it break some vi's feature in insert mode, such as column edit. Instead,
+  here add a advice function to change the sate as emacs when enter insert mode, but this is only limited in some
+  certain modes.
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (defvar my-mode-list-to-use-emacs-as-insert '(emacs-lisp-mode org-mode eshell-mode lisp-interaction-mode)
+    "The mode in this list will consider insert state as emacs state by adding `advice-add' below.")
+
+  (defvar my-modes-use-emacs-init '(emacs-lisp-mode org-mode lisp-interaction-mode eshell-mode text-mode)
+    "The mode in this list will use emacs sate as a initial evil state.")
+
+  (with-eval-after-load "evil"
+    (setq evil-default-state 'normal)
+      ;; (defalias 'evil-inset-mode 'evil-emacs-state)
     (define-key evil-emacs-state-map [escape] 'evil-normal-state)
     ;; (define-key evil-emacs-state-map (kbd "<ESC>") 'evil-normal-state)
-    (my-evil-config))
+    (dolist (mode my-modes-use-emacs-init) (evil-set-initial-state mode 'emacs))
+    (advice-add 'evil-insert-state :after (lambda (&optional arg)
+                                            (when (memq major-mode my-mode-list-to-use-emacs-as-insert)
+                                              (evil-emacs-state)))))
 #+END_SRC
 
+
 * Evil-escape
 [[https://github.com/syl20bnr/evil-escape][evil-escape]], escape from anything with customizable key sequence.
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
@@ -70,7 +61,7 @@ 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 '(normal visual motion))
+    (setq-default evil-escape-excluded-states '(normal visual motion emacs))
     (setq-default evil-escape-excluded-major-modes '(emacs-lisp-mode org-mode))
     :config
     (evil-escape-mode))
@@ -88,7 +79,6 @@ https://www.emacswiki.org/emacs/Evil
     (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
@@ -97,20 +87,28 @@ https://www.emacswiki.org/emacs/Evil
     (evil-leader/set-key "q" 'evil-quit)
     ;; others
     (evil-leader/set-key "h" 'help)
-    (evil-leader/set-key "h" 'help))
+    (evil-leader/set-key "g" 'magit-status)
+    (evil-leader/set-key "d" 'dired)
+    (evil-leader/set-key "e" 'sd/toggle-project-eshell))
+
+  (with-eval-after-load "evil"
+    (evil-define-key 'emacs eshell-mode-map (kbd ";e") 'sd/toggle-project-eshell)
+    (evil-define-key 'emacs eshell-mode-map (kbd ";d") 'dired)
+    (evil-define-key 'emacs eshell-mode-map (kbd "C-;") 'mode-line-other-buffer))
 
 #+END_SRC
 
-* Evil-match
+* other extention
+** Evil-matchit
 [[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))
+    (global-evil-matchit-mode 1))
 #+END_SRC
 
-* Evil-visualstar
+** Evil-visualstar
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (use-package evil-visualstar
     :ensure t
@@ -119,6 +117,50 @@ https://www.emacswiki.org/emacs/Evil
     :config
     (global-evil-visualstar-mode))
 #+END_SRC
+* Key bindings
+There are three kinds key bindings
+- prefix key is the leader key, defined by evil-leader. *;*
+- prefix key is the =Ctrl=,
+- prefix key is =\=, 
+
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    (mapc (lambda (map)
+            (define-key map "\C-W s" 'evil-window-split)
+            (define-key map "\C-W v" 'evil-window-vsplit)
+            (define-key map "\C-h" 'evil-window-left)
+            (define-key map "\C-j" 'evil-window-down)
+            (define-key map "\C-k" 'evil-window-up)
+            (define-key map "\C-l" 'evil-window-right)
+            (define-key map (kbd "C->") (lambda () (interactive) (evil-window-increase-width 3)))
+            (define-key map (kbd "C-<") (lambda () (interactive) (evil-window-decrease-width 3)))
+            (define-key map (kbd "C-+") (lambda () (interactive) (evil-window-increase-height 3)))
+            (define-key map (kbd "C--") (lambda () (interactive) (evil-window-decrease-height 3)))
+            (define-key map (kbd "C-=") (lambda () (interactive) (balance-windows))))
+          (list evil-normal-state-map evil-motion-state-map))
+
+    (define-key evil-normal-state-map (kbd "C-SPC") 'mode-line-other-buffer)
+    (define-key evil-normal-state-map (kbd "C-;") 'previous-multiframe-window)
+
+    (define-key evil-insert-state-map (kbd "C-p") 'previous-line)
+    (define-key evil-insert-state-map (kbd "C-n") 'next-line))
+
+#+END_SRC
+
+
+Let the search highlight persistent, https://stackoverflow.com/questions/25768036/emacs-evil-non-incremental-search-and-persistent-highlighting/34252236
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (evil-select-search-module 'evil-search-module 'evil-search)
+
+  (with-eval-after-load "evil"
+    (define-key evil-normal-state-map "\\" nil)
+    (define-key evil-normal-state-map "\\\\" #'evil-ex-nohighlight))
+#+END_SRC
+* Others
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (dolist (mode '(c-mode-hook lua-mode-hook))
+    (add-hook mode (lambda () (setq indent-tabs-mode nil))))
+#+END_SRC
 * Provide 
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (provide 'init-evil-mode)