X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=6adc4d914ad9c101764db72def9fc97299933158;hb=91d6442af37c49a429d2da637b06a44f522cbcae;hp=86b576dc18e280b78ffe21244593e8526690e7d4;hpb=ce7d0cc9a4b505c0ef162e86a47fac185ae61861;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 86b576d..6adc4d9 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -16,25 +16,37 @@ https://www.emacswiki.org/emacs/Evil.
     ;; (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))
+    ;; others, don't move back cursor when exit insert mode
+    (setq evil-move-cursor-back nil)
     :config
-    (require 'evil-leader)
-    (global-evil-leader-mode)
-    (evil-mode t)
-
-    (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-leader
+      :ensure t
+      :init
+      :config
+      (evil-leader/set-leader ";")
+      (global-evil-leader-mode))
+    ;; (require 'evil-leader)
+    (evil-mode t))
+
+  (add-hook 'prog-mode-hook #'(lambda ()
+                                (modify-syntax-entry ?_ "w")
+                                ;; (modify-syntax-entry ?- "w")
+                                ))
+
+  (with-eval-after-load "evil"
+    ;; remap x to X as `evil-move-cursor-back' is set nil
+    ;; (define-key evil-normal-state-map [remap evil-delete-char] 'evil-delete-backward-char)
+    (define-key evil-normal-state-map (kbd "x") (lambda () (interactive)
+                                                  (let ((org evil-move-cursor-back))
+                                                    (setq evil-move-cursor-back t)
+                                                    (call-interactively 'evil-delete-char)
+                                                    ;; (evil-delete-char)
+                                                    (setq evil-move-cursor-back org)))))
 #+END_SRC
 
 ** Initial mode and state config
@@ -45,10 +57,19 @@ https://www.emacswiki.org/emacs/Evil.
   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)
+  (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)
+  (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"
@@ -76,48 +97,231 @@ https://www.emacswiki.org/emacs/Evil.
     (evil-escape-mode))
 #+END_SRC
 
-* Evil-Leader
+* 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-leader
+  (use-package evil-surround
     :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)
+    (global-evil-surround-mode 1))
+#+END_SRC
+* Key bindings
+** Evil-Leader
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil-leader"
+    ;; Buffer & File explore
+    (evil-leader/set-key "b" 'counsel-projectile-find-file)
+    (evil-leader/set-key "f" 'ivy-switch-buffer)
     (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 "t" 'sd/hydra-window-layout/body)
     (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" (lambda () (interactive) (dired default-directory)))
+    (evil-leader/set-key "d" 'dired)
+    (evil-leader/set-key "e" 'sd/toggle-project-eshell)
     (evil-leader/set-key "h" 'help))
+#+END_SRC
+** Basic state 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)))
+            ;; As ; has been defined as leader, so remap , to ; repeaat t/f
+            (define-key map (kbd ",") 'evil-repeat-find-char))
+          (list evil-normal-state-map evil-motion-state-map))
+
+    
+    ;; (define-key evil-normal-state-map  "s" nil)
+    ;; (define-key evil-normal-state-map  "sj" 'ivy-switch-buffer)
+    ;; normal state
+    (define-key evil-normal-state-map (kbd "C-SPC") 'mode-line-other-buffer)
+    (define-key evil-normal-state-map (kbd "C-;") 'previous-multiframe-window)
+    ;; insert state
+    (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)
+    (define-key evil-insert-state-map (kbd "C-a") 'move-beginning-of-line)
+    (define-key evil-insert-state-map (kbd "C-e") 'move-end-of-line)
+    (define-key evil-insert-state-map (kbd "C-k") 'kill-line)
+    ;; motion mode
+    (define-key evil-motion-state-map (kbd "SPC") 'scroll-up-command)
+    (define-key evil-motion-state-map (kbd "S-SPC") 'scroll-down-command))
 #+END_SRC
 
-* Evil-match
-[[https://github.com/redguardtoo/evil-matchit]]
+
+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
-  (use-package evil-matchit
-    :ensure t
-    :config
-    (global-evil-leader-mode 1))
+  (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)
+    (define-key evil-normal-state-map "\\f" #'describe-function)
+    (define-key evil-normal-state-map "\\v" #'describe-variable))
 #+END_SRC
 
-* Evil-visualstar
+** Eshell
 #+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))
+  (add-hook 'eshell-mode-hook (lambda ()
+                                (when (and (boundp 'evil-mode) evil-mode)
+                                  (dolist (key-fun '(("f" . ivy-switch-buffer)
+                                                     ("b" . counsel-projectile-find-file)
+                                                     ("r" . counsel-recentf)
+                                                     ("t" . sd/hydra-window-layout/body)
+                                                     ("e" . sd/toggle-project-eshell)
+                                                     ("d" . dired)
+                                                     ("'" . other-window)
+                                                     ("h" . help)
+                                                     ("q" . evil-quit)))
+                                    (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun))))
+                                ;; (define-key eshell-mode-map (kbd "C-j") nil)
+                                ))
+
+  ;; 
+  ;; (add-hook 'eshell-mode-map
+  ;;        (lambda ()
+  ;;          (mapc (lambda (key-fun)
+  ;;                  (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun)))
+  ;;                '(("e" . dired)))))
+
+  ;; (add-hook 'eshell-mode-hook (lambda ()
+  ;;                               (loop for (key . fun) in '(
+  ;;                                                          ("e" . sd/toggle-project-eshell))
+  ;;                                     do (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader key)) fun))))
+#+END_SRC
+** Dired mode
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    ;; file and directory explore
+    (define-key dired-mode-map (kbd "C-h") nil)
+    (define-key dired-mode-map (kbd "C-k") nil)
+    (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") 'sd/dired-next-line)
+    (evil-define-key 'normal dired-mode-map (kbd "k") 'sd/dired-previous-line)
+    (evil-define-key 'normal dired-mode-map (kbd "h") 'sd/dired-up-directory)
+    (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 "+") 'dired-create-directory)
+    (evil-define-key 'normal dired-mode-map (kbd "C") 'dired-do-copy)
+    (evil-define-key 'normal dired-mode-map (kbd "R") 'dired-do-rename)
+
+    ;; 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
+
+** Org Mode (worf mode) and Lispy mode
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    (with-eval-after-load "lispy"
+      (evil-define-key 'normal lispy-mode-map (kbd "[") (lambda ()
+                                                          (interactive)
+                                                          (call-interactively #'lispy-backward)
+                                                          (evil-emacs-state)))
+      (evil-define-key 'normal lispy-mode-map (kbd "]") (lambda ()
+                                                          (interactive)
+                                                          (call-interactively #'lispy-forward)
+                                                          (evil-emacs-state))))
+    (with-eval-after-load "worf"
+      (evil-define-key 'normal worf-mode-map (kbd "[") (lambda ()
+                                                         (interactive)
+                                                         (call-interactively #'worf-backward)
+                                                         (evil-emacs-state)))
+      (evil-define-key 'normal worf-mode-map (kbd "]") (lambda ()
+                                                         (interactive)
+                                                         (call-interactively #'worf-forward)
+                                                         (evil-emacs-state)))
+      ;; (evil-define-key 'normal worf-mode-map (kbd "g") (lambda ()
+      ;;                                                    (interactive)
+      ;;                                                    (wspecial-worf-goto)
+      ;;                                                    (evil-emacs-state)))
+      ))
+#+END_SRC
+
+** Avy & Evil
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    (dolist (map (list evil-normal-state-map
+                       evil-visual-state-map
+                       evil-motion-state-map))
+      (define-key map (kbd "J") 'avy-goto-line-below)
+      (define-key map (kbd "K") 'avy-goto-line-above)
+      (define-key map (kbd "F") 'avy-goto-char)
+      (define-key map (kbd "W") 'avy-goto-char-timer)))
+#+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