howard/hamacs
howard/hamacs
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Converting evil-define-key to :general calls

Browse source 
i think it is easier to read. Slightly.
This commit is contained in:
Howard Abrams 2022-05-11 10:52:12 -07:00
parent d3907c810a
commit ffd8925320
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ha-config.org
View file

@ -775,6 +775,8 @@ Ways to search for information goes under the ~s~ key. This primarily depends on
; (grep-apply-setting 'grep-command "rg -n -H --no-heading -e ") ; (grep-apply-setting 'grep-command "rg -n -H --no-heading -e ")
:config :config
(rg-enable-default-bindings (kbd "M-R"))
(ha-leader (ha-leader
"s" '(:ignore t :which-key "search") "s" '(:ignore t :which-key "search")
"s q" '("close" . ha-rg-close-results-buffer) "s q" '("close" . ha-rg-close-results-buffer)
@ -787,7 +789,6 @@ Ways to search for information goes under the ~s~ key. This primarily depends on
"s j" '("next results" . ha-rg-go-next-results) "s j" '("next results" . ha-rg-go-next-results)
"s k" '("prev results" . ha-rg-go-previous-results) "s k" '("prev results" . ha-rg-go-previous-results)
"s b" '("results buffer" . ha-rg-go-results-buffer)) "s b" '("results buffer" . ha-rg-go-results-buffer))
(rg-enable-default-bindings (kbd "M-R"))
(defun ha-rg-close-results-buffer () (defun ha-rg-close-results-buffer ()
"Close to the `*rg*' buffer that `rg' creates." "Close to the `*rg*' buffer that `rg' creates."
@ -913,16 +914,15 @@ The [[https://github.com/minad/consult][consult project]] aims to use the librar
xref-show-definitions-function #'consult-xref) xref-show-definitions-function #'consult-xref)
:config :config
(define-key evil-normal-state-map (kbd "g p") 'consult-yank-pop)
(define-key evil-normal-state-map (kbd "g s") 'consult-line)
;; And some leader keys since that seems to be the only place I remember:
(ha-leader (ha-leader
"RET" '("bookmark" . consult-bookmark) "RET" '("bookmark" . consult-bookmark)
"o i" '("imenu" . consult-imenu) "o i" '("imenu" . consult-imenu)
"x y" '("preview yank" . consult-yank-pop))) "x y" '("preview yank" . consult-yank-pop))
:general
(:states 'normal :keymaps 'global-mode-map
"gp" 'consult-yank-pop
"gs" 'consult-line))
#+END_SRC #+END_SRC
*** Consult for Projects *** Consult for Projects
One of the reasons that Consult hasn’t been too important to me, is that I often narrow my searching based on projectile. So let’s see what the [[https://gitlab.com/OlMon/consult-projectile][consult-projectile]] can offer. One of the reasons that Consult hasn’t been too important to me, is that I often narrow my searching based on projectile. So let’s see what the [[https://gitlab.com/OlMon/consult-projectile][consult-projectile]] can offer.
@ -1021,10 +1021,11 @@ Doom introduced me to [[https://github.com/hlissner/evil-snipe][evil-snipe]] whi
:after evil :after evil
:init :init
(setq evil-snipe-scope 'visible) (setq evil-snipe-scope 'visible)
:config
(evil-define-key '(normal motion operator visual) global-map :general
"gs" #'evil-snipe-s (:states '(normal motion operator visual) :keymaps 'global-mode-map
"gS" #'evil-snipe-S)) "gs" 'evil-snipe-s
"gS" 'evil-snipe-S))
#+END_SRC #+END_SRC
It highlights all potential matches, use ~;~ to skip to the next match, and ~,~ to jump back. It highlights all potential matches, use ~;~ to skip to the next match, and ~,~ to jump back.
** Evil Surround ** Evil Surround
@ -1065,9 +1066,13 @@ While I grew up on =Control S=, I am liking the /mental model/ associated with t
avy-orders-alist avy-orders-alist
'((avy-goto-char . avy-order-closest) '((avy-goto-char . avy-order-closest)
(avy-goto-word-0 . avy-order-closest))) (avy-goto-word-0 . avy-order-closest)))
:config (ha-leader "j" '("jump" . avy-goto-char-timer)) :config (ha-leader "j" '("jump" . avy-goto-char-timer))
(evil-define-key '(normal motion operator visual) global-map
"go" #'avy-goto-char-timer) :general
(:states '(normal motion operator visual) :keymaps 'global-mode-map
"go" 'avy-goto-char-timer)
:bind ("<f18>" . avy-goto-char-timer)) :bind ("<f18>" . avy-goto-char-timer))
#+END_SRC #+END_SRC
*Note:* The links should be shorter near the point as opposed to starting from the top of the window. *Note:* The links should be shorter near the point as opposed to starting from the top of the window.