Emacs - evil & avy

[dotfiles.git] / emacs.d / emacs-evil.org

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index b66817a..6adc4d9 100644 (file)
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -129,20 +129,14 @@ https://www.emacswiki.org/emacs/Evil.
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (with-eval-after-load "evil-leader"
     ;; Buffer & File explore
-    ;; (with-eval-after-load "ivy")
-    ;; (with-eval-after-load "counsel")
-    ;; (when (require 'ivy))
     (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 "o" 'ido-find-file)
-    ;; (evil-leader/set-key "t" 'projectile-find-file)
-    ;; (evil-leader/set-key "w" 'evil-save)
     (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)
@@ -170,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)
@@ -194,7 +194,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
@@ -202,11 +204,13 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
   (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)
+                                                     ("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)
@@ -295,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))