Emacs - improve ivy & projectile
[dotfiles.git] / emacs.d / emacs-evil.org
index 6adc4d9..64a5ec2 100644 (file)
@@ -22,7 +22,7 @@ https://www.emacswiki.org/emacs/Evil.
     (setq evil-replace-state-cursor '("red" bar))
     (setq evil-operator-state-cursor '("red" hollow))
     ;; others, don't move back cursor when exit insert mode
-    (setq evil-move-cursor-back nil)
+    ;; (setq evil-move-cursor-back nil)
     :config
     (use-package evil-leader
       :ensure t
@@ -37,16 +37,6 @@ https://www.emacswiki.org/emacs/Evil.
                                 (modify-syntax-entry ?_ "w")
                                 ;; (modify-syntax-entry ?- "w")
                                 ))
-
-  (with-eval-after-load "evil"
-    ;; remap x to X as `evil-move-cursor-back' is set nil
-    ;; (define-key evil-normal-state-map [remap evil-delete-char] 'evil-delete-backward-char)
-    (define-key evil-normal-state-map (kbd "x") (lambda () (interactive)
-                                                  (let ((org evil-move-cursor-back))
-                                                    (setq evil-move-cursor-back t)
-                                                    (call-interactively 'evil-delete-char)
-                                                    ;; (evil-delete-char)
-                                                    (setq evil-move-cursor-back org)))))
 #+END_SRC
 
 ** Initial mode and state config
@@ -127,23 +117,30 @@ https://www.emacswiki.org/emacs/Evil.
 * Key bindings
 ** Evil-Leader
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (defun sd/swith-to-buffer ()
+    "switch to buffer"
+    (interactive)
+    (call-interactively 'projectile-switch-to-buffer))
+
   (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))
+    (cl-loop for (key . fun ) in '(("F" . counsel-projectile-switch-to-buffer)
+                                   ("f" . (lambda () (interactive)
+                                            (call-interactively (if (projectile-project-p)
+                                                                    'projectile-switch-to-buffer
+                                                                  'ivy-switch-buffer))))
+                                   ("b" . counsel-projectile-find-file)
+                                   ("r" . ivy-recentf)
+                                   ("w" . save-buffer)
+                                   ("v" . evil-window-vsplit)
+                                   ("s" . evil-window-split)
+                                   ("t" . sd/hydra-gtags/body)
+                                   ("p" . sd/hydra-projectile/body)
+                                   ("q" . evil-quit)
+                                   ("g" . magit-status)
+                                   ("e" . sd/toggle-project-eshell)
+                                   ("d" . dired)
+                                   ("h" . help))
+             do (evil-leader/set-key key fun)))
 #+END_SRC
 ** Basic state bindings
 There are three kinds key bindings
@@ -169,22 +166,42 @@ There are three kinds key bindings
             (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)
     ;; insert state
-    (define-key evil-insert-state-map (kbd "C-p") 'previous-line)
-    (define-key evil-insert-state-map (kbd "C-n") 'next-line)
-    (define-key evil-insert-state-map (kbd "C-h") 'delete-backward-char)
-    (define-key evil-insert-state-map (kbd "C-a") 'move-beginning-of-line)
-    (define-key evil-insert-state-map (kbd "C-e") 'move-end-of-line)
-    (define-key evil-insert-state-map (kbd "C-k") 'kill-line)
+    (cl-loop for (key-sequence . fun) in '(("C-;" . iedit-mode)
+                                           ("C-n" . next-line)
+                                           ("C-p" . previous-line)
+                                           ("C-a" . move-beginning-of-line)
+                                           ("C-e" . move-end-of-line)
+                                           ("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))
+    ;; (define-key evil-motion-state-map (kbd "SPC") 'scroll-up-command)
+    ;; (define-key evil-motion-state-map (kbd "S-SPC") 'scroll-down-command)
+    )
+
+
+  ;; (keymapp (car (list evil-normal-state-map evil-visual-state-map)))
+
+  ;; (keymapp (car '(evil-normal-state-map evil-visual-state-map)))
+  ;; (keymapp (car `(,evil-normal-state-map ,evil-visual-state-map)))
+
+
+  ;; (keymapp evil-normal-state-map)
+  ;; (keymapp 'evil-normal-state-map)
+  ;; (keymapp `,evil-normal-state-map)
 #+END_SRC
 
 
@@ -215,18 +232,6 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
                                     (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
@@ -271,12 +276,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
@@ -299,24 +304,32 @@ 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
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
+  (setq avy-keys '(?a ?s ?d ?g
+                      ?h ?k ?l
+                      ?q ?w ?e ?r ?t
+                      ?y ?u ?i ?o ?p
+                      ?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 "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 "gw") 'avy-goto-word-0-below)
+      (define-key map (kbd "gb") 'avy-goto-word-0-above)
+      (define-key map (kbd "ge") 'avy-goto-word-0)
+      (define-key map (kbd "gc") 'avy-goto-char)))
+#+END_SRC
+
+** ggtags
+#+BEGIN_SRC emacs-lisp :tangle yes :results silent
+
 #+END_SRC
 * Others
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent