X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=8c91ebc1596f84c0a00777346728da4924e12790;hb=ec3015036271d6b57b8f5f20b75643629a22e046;hp=fb5dbdb10f0b785ed45062a4899b769545bd5022;hpb=a5dceee45565268053e96ec4e6ebbae10da49e36;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index fb5dbdb..8c91ebc 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -97,33 +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 "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 "p" '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 "h" 'help)
-    (evil-leader/set-key "g" 'magit-status)
-    (evil-leader/set-key "d" 'dired)
-    (evil-leader/set-key "e" 'sd/toggle-project-eshell))
-
-  (with-eval-after-load "evil"
-    (evil-define-key 'emacs eshell-mode-map (kbd ";e") 'sd/toggle-project-eshell)
-    (evil-define-key 'emacs eshell-mode-map (kbd ";d") 'dired)
-    (evil-define-key 'emacs eshell-mode-map (kbd "C-;") 'mode-line-other-buffer))
-
-#+END_SRC
-
 * other extention
 ** Evil-matchit
 [[https://github.com/redguardtoo/evil-matchit]]
@@ -151,10 +124,38 @@ https://www.emacswiki.org/emacs/Evil.
     :config
     (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
+    ;; (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 "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. *;*
+- prefix key is the leader key, defined by evil-leader.
 - prefix key is the =Ctrl=,
 - prefix key is =\=, 
 
@@ -198,6 +199,33 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
     (define-key evil-normal-state-map "\\\\" #'evil-ex-nohighlight))
 #+END_SRC
 
+** 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)
+                                                     ("e" . sd/toggle-project-eshell)
+                                                     ("d" . dired)
+                                                     ("'" . other-window)
+                                                     ("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
   (with-eval-after-load "evil"
@@ -252,7 +280,7 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
 ** Org Mode (worf mode) and Lispy mode
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (with-eval-after-load "evil"
-    (with-eval-after-load "lispy-mode"
+    (with-eval-after-load "lispy"
       (evil-define-key 'normal lispy-mode-map (kbd "[") (lambda ()
                                                           (interactive)
                                                           (call-interactively #'lispy-backward)
@@ -261,7 +289,7 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
                                                           (interactive)
                                                           (call-interactively #'lispy-forward)
                                                           (evil-emacs-state))))
-    (with-eval-after-load "worf-mode"
+    (with-eval-after-load "worf"
       (evil-define-key 'normal worf-mode-map (kbd "[") (lambda ()
                                                          (interactive)
                                                          (call-interactively #'worf-backward)