Emacs - some binding of eshell with evil mode

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

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index e4debb2..a0a14a5 100644 (file)
--- 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,21 @@ 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")
+                                ))
+
+  (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
@@ -66,7 +83,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
@@ -101,10 +117,6 @@ https://www.emacswiki.org/emacs/Evil.
     (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)
-    (evil-define-key 'emacs eshell-mode-map (kbd "C-;") 'mode-line-other-buffer))
 
 #+END_SRC
 
@@ -136,6 +148,7 @@ https://www.emacswiki.org/emacs/Evil.
     (global-evil-surround-mode 1))
 #+END_SRC
 * Key bindings
+** Basic state bindings
 There are three kinds key bindings
 - prefix key is the leader key, defined by evil-leader. *;*
 - prefix key is the =Ctrl=,
@@ -163,6 +176,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))
@@ -178,7 +194,21 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
     (define-key evil-normal-state-map "\\\\" #'evil-ex-nohighlight))
 #+END_SRC
 
-- Dired mode
+** Eshell
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (with-eval-after-load "evil"
+    (with-eval-after-load "evil-leader"
+      (with-eval-after-load "eshell"
+        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "e")) #'sd/toggle-project-eshell)
+        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "d")) #'dired)
+        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "f")) #'ido-switch-buffer)
+        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "q")) #'evil-quit)
+        (evil-define-key 'emacs eshell-mode-map (kbd "C-;") 'mode-line-other-buffer)
+        ;; (evil-define-key 'emacs eshell-mode-map (kbd ";q") 'evil-quit)
+        )))
+
+#+END_SRC
+** Dired mode
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (with-eval-after-load "evil"
     ;; file and directory explore
@@ -193,8 +223,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)
@@ -206,7 +237,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)
@@ -216,7 +249,7 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
 
 #+END_SRC
 
-- expand region
+** expand region
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (with-eval-after-load "evil"
     (with-eval-after-load "expand-region"
@@ -226,6 +259,29 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
       (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)))))
+#+END_SRC
+
 * Others
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (dolist (mode '(c-mode-hook lua-mode-hook))