X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=c66dc9e422a908a4a7f8b95883bd2d78c2ceff86;hb=20549996811d8734ad35f5c0d473a070c3579db1;hp=8c123e408dff22a0471ee00b93391fecbefdf44b;hpb=ffd3fa7a4050bb13b0c3c7e1d4b9970a70eeaadf;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 8c123e4..c66dc9e 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -21,6 +21,8 @@ https://www.emacswiki.org/emacs/Evil.
     (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
     (use-package evil-leader
       :ensure t
@@ -30,6 +32,11 @@ https://www.emacswiki.org/emacs/Evil.
       (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
@@ -66,7 +73,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
@@ -163,6 +169,9 @@ There are three kinds key bindings
     (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))
@@ -182,6 +191,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)
@@ -191,8 +202,9 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
     (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 (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)
@@ -204,7 +216,9 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
     (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)
+    (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)