Emacs - add color identifiers and set fold font for keywords face

[dotfiles.git] / emacs.d / emacs-evil.org

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 174e05f..814ab75 100644 (file)
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -21,10 +21,21 @@ 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
-    (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 +72,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 +88,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)
@@ -162,6 +168,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))
@@ -181,6 +190,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)
@@ -203,7 +214,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)