X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=1d93c6e272d9534ab118cf0dbb76f4db90af8407;hb=ce562e8d702a6af572e9955c7c0ee713516b6b37;hp=7127b0bc408e58ff1c396bfaa0b435dbf7b51cd1;hpb=1b8493bd45eda21f6c84135577546c8132f3911a;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 7127b0b..1d93c6e 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.
@@ -195,17 +193,32 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
 
 ** Eshell
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
-  (with-eval-after-load "evil"
-    (with-eval-after-load "evil-leader"
-      (with-eval-after-load "eshell"
-        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "e")) #'sd/toggle-project-eshell)
-        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "d")) #'dired)
-        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "f")) #'ido-switch-buffer)
-        (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader "q")) #'evil-quit)
-        (evil-define-key 'emacs eshell-mode-map (kbd "C-;") 'mode-line-other-buffer)
-        ;; (evil-define-key 'emacs eshell-mode-map (kbd ";q") 'evil-quit)
-        )))
+  (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