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

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 86b576d..6ad4ee6 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -16,6 +16,7 @@ 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))
@@ -25,16 +26,19 @@ https://www.emacswiki.org/emacs/Evil.
     (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))))
+    (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)))
 #+END_SRC
 
 ** Initial mode and state config
@@ -60,8 +64,27 @@ https://www.emacswiki.org/emacs/Evil.
     (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
 
+** state key mapping
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    (define-key evil-normal-state-map (kbd "C-SPC") 'mode-line-other-buffer)
+    (define-key evil-normal-state-map (kbd "C-;") 'previous-multiframe-window)
+    (evil-define-key 'emacs eshell-mode-map (kbd "C-;") 'previous-multiframe-window))
+#+END_SRC
+
+** face attribute
+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
 * 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
@@ -88,7 +111,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,17 +119,23 @@ 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))
 
 #+END_SRC
 
-* Evil-match
+* 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
@@ -119,6 +147,11 @@ https://www.emacswiki.org/emacs/Evil.
     :config
     (global-evil-visualstar-mode))
 #+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)