X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;ds=sidebyside;f=emacs.d%2Femacs-evil.org;h=6dd057c91fc450af94ec0b48015c4bd3ff2cb5a7;hb=09244749647bbdadfda424e6dc3042184cf109e7;hp=fc936b2162b7667e03aa1ef37fe0a91b3503da1b;hpb=212daa8f51b00f7353cd32c6edf1bc71c49a99b8;p=dotfiles.git diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index fc936b2..6dd057c 100644 --- a/emacs.d/emacs-evil.org +++ b/emacs.d/emacs-evil.org @@ -118,14 +118,13 @@ https://www.emacswiki.org/emacs/Evil. ** Evil-Leader #+BEGIN_SRC emacs-lisp :tangle yes :results silent (with-eval-after-load "evil-leader" - (cl-loop for (key . fun ) in '(("F" . counsel-projectile-switch-to-buffer) - ("f" . ivy-switch-buffer) - ("b" . counsel-projectile-find-file) + (cl-loop for (key . fun ) in '(("f" . sd/swith-to-buffer) + ("b" . projectile-find-file) ("r" . ivy-recentf) ("w" . save-buffer) ("v" . evil-window-vsplit) ("s" . evil-window-split) - ("t" . sd/hydra-gtags/body) + ("t" . sd/hydra-window-layout/body) ("p" . sd/hydra-projectile/body) ("q" . evil-quit) ("g" . magit-status) @@ -149,11 +148,6 @@ There are three kinds key bindings (define-key map "\C-j" 'evil-window-down) (define-key map "\C-k" 'evil-window-up) (define-key map "\C-l" 'evil-window-right) - (define-key map (kbd "C->") (lambda () (interactive) (evil-window-increase-width 3))) - (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))) ;; 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)) @@ -167,9 +161,15 @@ There are three kinds key bindings ("C-h" . delete-backward-char) ("C-k" . kill-line)) do (define-key evil-insert-state-map (kbd key-sequence) fun)) - - - + + ;; remap some vim keybindings + (dolist (map (list + evil-normal-state-map + evil-visual-state-map + evil-motion-state-map)) + (cl-loop for (keys . fun) in '(("'" . evil-goto-mark) + ("`" . evil-goto-mark-line)) + do (define-key map (kbd keys) 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)) @@ -187,34 +187,30 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 (define-key evil-normal-state-map "\\v" #'describe-variable)) #+END_SRC +Go, =g= command + +- =g#= =g*= :: same as =#=, =*=, but without using "\<" and "\>" +- =g$= :: same as =$= +- =g&= :: repease last =:s= on all lines +- g', g`, like ' ` but without changing the jumplist +- g+, g- +- g; :: +gs + ** 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) + (dolist (key-fun '(("f" . sd/swith-to-buffer) + ("b" . projectile-find-file) + ("r" . ivy-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)))) + (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun)))))) #+END_SRC ** Dired mode #+BEGIN_SRC emacs-lisp :tangle yes :results silent @@ -259,12 +255,12 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 ** 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))) + ;; (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 ** Org Mode (worf mode) and Lispy mode @@ -287,12 +283,7 @@ 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-define-key 'normal worf-mode-map (kbd "g") (lambda () - ;; (interactive) - ;; (wspecial-worf-goto) - ;; (evil-emacs-state))) - )) + (evil-emacs-state))))) #+END_SRC ** Avy & Evil @@ -304,16 +295,15 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803 ?z ?x ?c ?v ?b ?n ?m ?f ?j 59)) ;; (setq avy-background t) + (setq avy-all-windows nil) (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))) + (define-key map (kbd "ge") 'avy-goto-word-0) + (define-key map (kbd "gc") 'avy-goto-char))) #+END_SRC ** ggtags