X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=6adc4d914ad9c101764db72def9fc97299933158;hb=91d6442af37c49a429d2da637b06a44f522cbcae;hp=8c123e408dff22a0471ee00b93391fecbefdf44b;hpb=ffd3fa7a4050bb13b0c3c7e1d4b9970a70eeaadf;p=dotfiles.git diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index 8c123e4..6adc4d9 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,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 @@ -81,33 +97,6 @@ https://www.emacswiki.org/emacs/Evil. (evil-escape-mode)) #+END_SRC -* Evil-Leader -#+BEGIN_SRC emacs-lisp :tangle yes :results silent - (with-eval-after-load "evil-leader" - ;; Buffer & File - (evil-leader/set-key "f" 'ido-switch-buffer) - (evil-leader/set-key "w" 'evil-save) - (evil-leader/set-key "r" 'ivy-recentf) - (evil-leader/set-key "w" 'save-buffer) - (evil-leader/set-key "o" 'ido-find-file) - (evil-leader/set-key "p" 'projectile-find-file) - ;; Window - (evil-leader/set-key "s" 'evil-window-split) - (evil-leader/set-key "v" 'evil-window-vsplit) - (evil-leader/set-key "q" 'evil-quit) - ;; others - (evil-leader/set-key "h" 'help) - (evil-leader/set-key "g" 'magit-status) - (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 - * other extention ** Evil-matchit [[https://github.com/redguardtoo/evil-matchit]] @@ -136,8 +125,29 @@ https://www.emacswiki.org/emacs/Evil. (global-evil-surround-mode 1)) #+END_SRC * Key bindings +** Evil-Leader +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (with-eval-after-load "evil-leader" + ;; Buffer & File explore + (evil-leader/set-key "b" 'counsel-projectile-find-file) + (evil-leader/set-key "f" 'ivy-switch-buffer) + (evil-leader/set-key "r" 'ivy-recentf) + (evil-leader/set-key "w" 'save-buffer) + ;; Window + (evil-leader/set-key "s" 'evil-window-split) + (evil-leader/set-key "v" 'evil-window-vsplit) + (evil-leader/set-key "t" 'sd/hydra-window-layout/body) + (evil-leader/set-key "q" 'evil-quit) + ;; others + (evil-leader/set-key "g" 'magit-status) + ;; (evil-leader/set-key "d" (lambda () (interactive) (dired default-directory))) + (evil-leader/set-key "d" 'dired) + (evil-leader/set-key "e" 'sd/toggle-project-eshell) + (evil-leader/set-key "h" 'help)) +#+END_SRC +** Basic state bindings There are three kinds key bindings -- prefix key is the leader key, defined by evil-leader. *;* +- prefix key is the leader key, defined by evil-leader. - prefix key is the =Ctrl=, - prefix key is =\=, @@ -154,8 +164,14 @@ There are three kinds key bindings (define-key map (kbd "C-<") (lambda () (interactive) (evil-window-decrease-width 3))) (define-key map (kbd "C-+") (lambda () (interactive) (evil-window-increase-height 3))) (define-key map (kbd "C--") (lambda () (interactive) (evil-window-decrease-height 3))) - (define-key map (kbd "C-=") (lambda () (interactive) (balance-windows)))) + (define-key map (kbd "C-=") (lambda () (interactive) (balance-windows))) + ;; As ; has been defined as leader, so remap , to ; repeaat t/f + (define-key map (kbd ",") 'evil-repeat-find-char)) (list evil-normal-state-map evil-motion-state-map)) + + + ;; (define-key evil-normal-state-map "s" nil) + ;; (define-key evil-normal-state-map "sj" 'ivy-switch-buffer) ;; 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) @@ -163,6 +179,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)) @@ -175,13 +194,46 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 (with-eval-after-load "evil" (define-key evil-normal-state-map "\\" nil) - (define-key evil-normal-state-map "\\\\" #'evil-ex-nohighlight)) + (define-key evil-normal-state-map "\\\\" #'evil-ex-nohighlight) + (define-key evil-normal-state-map "\\f" #'describe-function) + (define-key evil-normal-state-map "\\v" #'describe-variable)) #+END_SRC -- Dired mode +** Eshell +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (add-hook 'eshell-mode-hook (lambda () + (when (and (boundp 'evil-mode) evil-mode) + (dolist (key-fun '(("f" . ivy-switch-buffer) + ("b" . counsel-projectile-find-file) + ("r" . counsel-recentf) + ("t" . sd/hydra-window-layout/body) + ("e" . sd/toggle-project-eshell) + ("d" . dired) + ("'" . other-window) + ("h" . help) + ("q" . evil-quit))) + (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun)))) + ;; (define-key eshell-mode-map (kbd "C-j") nil) + )) + + ;; + ;; (add-hook 'eshell-mode-map + ;; (lambda () + ;; (mapc (lambda (key-fun) + ;; (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun))) + ;; '(("e" . dired))))) + + ;; (add-hook 'eshell-mode-hook (lambda () + ;; (loop for (key . fun) in '( + ;; ("e" . sd/toggle-project-eshell)) + ;; do (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader key)) fun)))) +#+END_SRC +** Dired mode #+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 +243,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 +257,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) @@ -214,7 +269,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" @@ -224,6 +279,45 @@ 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))) + ;; (evil-define-key 'normal worf-mode-map (kbd "g") (lambda () + ;; (interactive) + ;; (wspecial-worf-goto) + ;; (evil-emacs-state))) + )) +#+END_SRC + +** Avy & Evil +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + (with-eval-after-load "evil" + (dolist (map (list evil-normal-state-map + evil-visual-state-map + evil-motion-state-map)) + (define-key map (kbd "J") 'avy-goto-line-below) + (define-key map (kbd "K") 'avy-goto-line-above) + (define-key map (kbd "F") 'avy-goto-char) + (define-key map (kbd "W") 'avy-goto-char-timer))) +#+END_SRC * Others #+BEGIN_SRC emacs-lisp :tangle yes :results silent (dolist (mode '(c-mode-hook lua-mode-hook))