X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=6adc4d914ad9c101764db72def9fc97299933158;hb=91d6442af37c49a429d2da637b06a44f522cbcae;hp=294ce4d246b697579a34f91718dca79ad5213ffd;hpb=27a400783a99d1fbaf067c172e39044efde09f5d;p=dotfiles.git diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org index 294ce4d..6adc4d9 100644 --- a/emacs.d/emacs-evil.org +++ b/emacs.d/emacs-evil.org @@ -97,28 +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 "b" '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 "t" '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 "g" 'magit-status) - (evil-leader/set-key "d" (lambda () (interactive) (dired default-directory))) - (evil-leader/set-key "e" 'sd/toggle-project-eshell) - (evil-leader/set-key "h" 'help)) -#+END_SRC - * other extention ** Evil-matchit [[https://github.com/redguardtoo/evil-matchit]] @@ -147,6 +125,26 @@ 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. @@ -166,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) @@ -190,18 +194,29 @@ 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 #+BEGIN_SRC emacs-lisp :tangle yes :results silent (add-hook 'eshell-mode-hook (lambda () - (dolist (key-fun '(("e" . sd/toggle-project-eshell) - ("d" . dired) - ("f" . ido-switch-buffer) - ("q" . evil-quit))) - (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun))))) + (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) @@ -284,9 +299,25 @@ 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 + (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))