X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=fc936b2162b7667e03aa1ef37fe0a91b3503da1b;hb=212daa8f51b00f7353cd32c6edf1bc71c49a99b8;hp=1d93c6e272d9534ab118cf0dbb76f4db90af8407;hpb=ce562e8d702a6af572e9955c7c0ee713516b6b37;p=dotfiles.git diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index 1d93c6e..fc936b2 100644 --- a/emacs.d/emacs-evil.org +++ b/emacs.d/emacs-evil.org @@ -22,7 +22,7 @@ https://www.emacswiki.org/emacs/Evil. (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) + ;; (setq evil-move-cursor-back nil) :config (use-package evil-leader :ensure t @@ -37,16 +37,6 @@ https://www.emacswiki.org/emacs/Evil. (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 @@ -128,22 +118,21 @@ https://www.emacswiki.org/emacs/Evil. ** 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)) + (cl-loop for (key . fun ) in '(("F" . counsel-projectile-switch-to-buffer) + ("f" . ivy-switch-buffer) + ("b" . counsel-projectile-find-file) + ("r" . ivy-recentf) + ("w" . save-buffer) + ("v" . evil-window-vsplit) + ("s" . evil-window-split) + ("t" . sd/hydra-gtags/body) + ("p" . sd/hydra-projectile/body) + ("q" . evil-quit) + ("g" . magit-status) + ("e" . sd/toggle-project-eshell) + ("d" . dired) + ("h" . help)) + do (evil-leader/set-key key fun))) #+END_SRC ** Basic state bindings There are three kinds key bindings @@ -164,18 +153,23 @@ 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)) - ;; 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-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) + (cl-loop for (key-sequence . fun) in '(("C-;" . iedit-mode) + ("C-n" . next-line) + ("C-p" . previous-line) + ("C-a" . move-beginning-of-line) + ("C-e" . move-end-of-line) + ("C-h" . delete-backward-char) + ("C-k" . kill-line)) + do (define-key evil-insert-state-map (kbd key-sequence) fun)) + + + ;; 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)) @@ -188,7 +182,9 @@ 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 ** Eshell @@ -291,9 +287,39 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 (evil-define-key 'normal worf-mode-map (kbd "]") (lambda () (interactive) (call-interactively #'worf-forward) - (evil-emacs-state))))) + (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 + (setq avy-keys '(?a ?s ?d ?g + ?h ?k ?l + ?q ?w ?e ?r ?t + ?y ?u ?i ?o ?p + ?z ?x ?c ?v ?b + ?n ?m ?f ?j 59)) + ;; (setq avy-background t) + (with-eval-after-load "evil" + (dolist (map (list evil-normal-state-map + evil-visual-state-map + evil-motion-state-map)) + (define-key map (kbd "gw") 'avy-goto-word-0-below) + (define-key map (kbd "gb") 'avy-goto-word-0-above) + (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 + +** ggtags +#+BEGIN_SRC emacs-lisp :tangle yes :results silent + +#+END_SRC * Others #+BEGIN_SRC emacs-lisp :tangle yes :results silent (dolist (mode '(c-mode-hook lua-mode-hook))