X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Femacs-evil.org;h=c66dc9e422a908a4a7f8b95883bd2d78c2ceff86;hb=20549996811d8734ad35f5c0d473a070c3579db1;hp=2e9a7cebf5c58ce52712e9198f261784ea1fa69c;hpb=1771976e7385e0a73318f0905e8172c1dd75d279;p=dotfiles.git diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index 2e9a7ce..c66dc9e 100644 --- a/emacs.d/emacs-evil.org +++ b/emacs.d/emacs-evil.org @@ -21,10 +21,22 @@ 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 +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 @@ -78,11 +89,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,13 +162,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-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)) #+END_SRC @@ -178,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) @@ -187,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) @@ -196,14 +212,30 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 (evil-define-key 'normal dired-mode-map (kbd "U") 'dired-unmark-all-marks) (evil-define-key 'normal dired-mode-map (kbd "z") #'sd/dired-get-size) (evil-define-key 'normal dired-mode-map (kbd "d") 'dired-flag-file-deletion) - (evil-define-key 'normal dired-mode-map (kbd "d") 'dired-flag-file-deletion) (evil-define-key 'normal dired-mode-map (kbd "x") 'dired-do-flagged-delete) (evil-define-key 'normal dired-mode-map (kbd "D") 'dired-do-delete) ;; File and folder creation - (evil-define-key 'normal dired-mode-map (kbd "D") 'dired-do-delete) - (evil-define-key 'normal dired-mode-map (kbd "D") 'dired-do-delete) - ) + (evil-define-key 'normal dired-mode-map (kbd "c") 'sd/dired-new-file) + (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) + (evil-define-key 'normal dired-mode-map (kbd "n") 'evil-search-next) + (evil-define-key 'normal dired-mode-map (kbd "N") 'evil-search-previous) + (evil-define-key 'normal dired-mode-map (kbd "v") 'evil-visual-char)) + +#+END_SRC + +- expand region +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (with-eval-after-load "evil" + (with-eval-after-load "expand-region" + (define-key evil-normal-state-map (kbd "SPC") 'er/expand-region) + (define-key evil-visual-state-map (kbd "SPC") 'er/expand-region) + (define-key evil-visual-state-map (kbd "S-SPC") 'er/contract-region) + (define-key evil-normal-state-map (kbd "S-SPC") 'er/contract-region))) #+END_SRC * Others