X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=d1bcd14430232eaa667b3902edf9511562a9dbbf;hb=4a763115492084f343d03584ae774b75265d3315;hp=fb2998abad4315af8aeccacf8b2c8ad9ca9dd79d;hpb=bb3d839011e6e395a0cf289591ffc8469be10de1;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index fb2998a..d1bcd14 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -22,9 +22,18 @@ 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)
+    (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")))
 #+END_SRC
 
 ** Initial mode and state config
@@ -61,7 +70,6 @@ https://www.emacswiki.org/emacs/Evil.
                                               (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
@@ -78,11 +86,7 @@ https://www.emacswiki.org/emacs/Evil.
 
 * 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 ";")
+  (with-eval-after-load "evil-leader"
     ;; Buffer & File
     (evil-leader/set-key "f" 'ido-switch-buffer)
     (evil-leader/set-key "w" 'evil-save)
@@ -155,14 +159,19 @@ There are three kinds key bindings
             (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))
-
+    ;; 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-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
 
 
@@ -179,6 +188,8 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
 #+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)