X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=fb2998abad4315af8aeccacf8b2c8ad9ca9dd79d;hb=be4017091a741b544d0a7761429fdd9f6635b128;hp=340957ce85d05f39df4bbfe95e2d78a5d3962074;hpb=abf9d0c4f2f7fa4904d4488116c300c171c622c2;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 340957c..fb2998a 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -1,72 +1,232 @@
 #+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.
 
-* Key-chord
-[[https://www.emacswiki.org/emacs/KeyChord][KeyChord]] lets you bind commands to combination key-strokes. This will be used in Evil mode.
-#+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (use-package key-chord
-    :ensure t
-    :init
-    (setq key-chord-two-keys-delay 0.1)
-    (setq key-chord-one-keys-delay 0.2)
-    :config
-    (key-chord-mode 1))
-#+END_SRC
-
 * 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-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
-    (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))
-
   (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-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))
     (setq evil-operator-state-cursor '("red" hollow))
     :config
-    (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))
+    (require 'evil-leader)
+    (global-evil-leader-mode)
+    (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
+                                    package-menu-mode
+                                    paradox-menu-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)
+    (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
+  (use-package evil-escape
+    :ensure t
+    :init
+    (setq-default evil-escape-delay 0.2)
+    (setq-default evil-escape-key-sequence "jj")
+    (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))
+#+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 "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 "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
+
+* 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-matchit-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
 
+** Evil-surround
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (use-package evil-surround
+    :ensure t
+    :config
+    (global-evil-surround-mode 1))
 #+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)
+    (define-key evil-insert-state-map (kbd "C-h") 'delete-backward-char))
+
+#+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
+
+- Dired mode
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    ;; file and directory explore
+    (evil-define-key 'normal dired-mode-map (kbd "H") 'dired-omit-mode)
+    (evil-define-key 'normal dired-mode-map (kbd "g") 'dired-goto-file)
+    (evil-define-key 'normal dired-mode-map (kbd "r") 'revert-buffer)
+    (evil-define-key 'normal dired-mode-map (kbd "i") 'dired-maybe-insert-subdir)
+    (evil-define-key 'normal dired-mode-map (kbd "TAB") 'diredp-next-subdir)
+    (evil-define-key 'normal dired-mode-map (kbd "J") 'diredp-next-subdir)
+    (evil-define-key 'normal dired-mode-map (kbd "K") 'diredp-prev-subdir)
+    (evil-define-key 'normal dired-mode-map (kbd "l") 'dired-display-file)
+    (evil-define-key 'normal dired-mode-map (kbd "f") 'dired-narrow)
+    (evil-define-key 'normal dired-mode-map (kbd "j") 'dired-next-line)
+    (evil-define-key 'normal dired-mode-map (kbd "k") 'dired-previous-line)
+    (evil-define-key 'normal dired-mode-map [C-backspace] 'dired-up-directory)
+    ;; file and folder deletion
+    (evil-define-key 'normal dired-mode-map (kbd "m") 'dired-mark)
+    (evil-define-key 'normal dired-mode-map (kbd "u") 'dired-unmark)
+    (evil-define-key 'normal dired-mode-map (kbd "U") 'dired-unmark-all-marks)
+    (evil-define-key 'normal dired-mode-map (kbd "z") #'sd/dired-get-size)
+    (evil-define-key 'normal dired-mode-map (kbd "d") 'dired-flag-file-deletion)
+    (evil-define-key 'normal dired-mode-map (kbd "x") 'dired-do-flagged-delete)
+    (evil-define-key 'normal dired-mode-map (kbd "D") 'dired-do-delete)
+    ;; File and folder creation
+    (evil-define-key 'normal dired-mode-map (kbd "c") 'sd/dired-new-file)
+    (evil-define-key 'normal dired-mode-map (kbd "C") 'dired-create-directory)
+
+    ;; keep some normap mapping
+    (evil-define-key 'normal dired-mode-map (kbd "/") 'evil-ex-search-forward)
+    (evil-define-key 'normal dired-mode-map (kbd "n") 'evil-search-next)
+    (evil-define-key 'normal dired-mode-map (kbd "N") 'evil-search-previous)
+    (evil-define-key 'normal dired-mode-map (kbd "v") 'evil-visual-char))
+
+#+END_SRC
+
+- expand region
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    (with-eval-after-load "expand-region"
+      (define-key evil-normal-state-map (kbd "SPC") 'er/expand-region)
+      (define-key evil-visual-state-map (kbd "SPC") 'er/expand-region)
+      (define-key evil-visual-state-map (kbd "S-SPC") 'er/contract-region)
+      (define-key evil-normal-state-map (kbd "S-SPC") 'er/contract-region)))
+#+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)
 #+END_SRC