diff options
| author | William Carroll <wpcarro@gmail.com> | 2020-01-18T22·52+0000 |
|---|---|---|
| committer | William Carroll <wpcarro@gmail.com> | 2020-01-22T21·13+0000 |
| commit | ec21e072a1d1471adadc0ca8646b79d0480482aa (patch) | |
| tree | ac339e2c6b8bf3b3ac9003ecec18a2f332d68230 /configs/shared/.emacs.d | |
| parent | d85df45babb74d67a761d2c4c64d7c7ea2bd624b (diff) | |
Prefer general to evil-leader
Another small step towards dropping support for evil-leader, which general supplants.
Diffstat (limited to 'configs/shared/.emacs.d')
| -rw-r--r-- | configs/shared/.emacs.d/wpc/bookmark.el | 18 | ||||
| -rw-r--r-- | configs/shared/.emacs.d/wpc/google-stuff.el | 11 |
2 files changed, 18 insertions, 11 deletions
diff --git a/configs/shared/.emacs.d/wpc/bookmark.el b/configs/shared/.emacs.d/wpc/bookmark.el index 60759a841416..7f912f1b1734 100644 --- a/configs/shared/.emacs.d/wpc/bookmark.el +++ b/configs/shared/.emacs.d/wpc/bookmark.el @@ -93,16 +93,20 @@ Otherwise, open with `counsel-find-file'." bookmark/open)))) (when bookmark/install-kbds? - (evil-leader/set-key - "jj" #'bookmark/ivy-open) + (general-define-key + :prefix "<SPC>" + :states '(normal) + "jj" #'bookmark/ivy-open) (->> bookmark/whitelist (list/map (lambda (b) - (evil-leader/set-key - (string/concat "j" (bookmark-kbd b)) - ;; TODO: Consider `cl-labels' so `which-key' minibuffer is more - ;; helpful. - (lambda () (interactive) (bookmark/open b))))))) + (general-define-key + :prefix "<SPC>" + :states '(normal) + (string/concat "j" (bookmark-kbd b)) + ;; TODO: Consider `cl-labels' so `which-key' minibuffer is more + ;; helpful. + (lambda () (interactive) (bookmark/open b))))))) (provide 'bookmark) ;;; bookmark.el ends here diff --git a/configs/shared/.emacs.d/wpc/google-stuff.el b/configs/shared/.emacs.d/wpc/google-stuff.el index f2632f7880e5..96c80565965a 100644 --- a/configs/shared/.emacs.d/wpc/google-stuff.el +++ b/configs/shared/.emacs.d/wpc/google-stuff.el @@ -28,10 +28,10 @@ (require 'f) (require 'ivy-helpers) -(require 'evil-leader) (require 'maybe) (require 'device) (require 'macros) +(require 'general) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Library @@ -204,9 +204,12 @@ When on a corporate laptop, remote connections are made using Tramp." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (when google-stuff/install-kbds? - (evil-leader/set-key "Gs" #'fig-status) - (evil-leader/set-key "Cs" #'google-stuff/open-buffer-in-cs) - (evil-leader/set-key "jc" #'google-stuff/jump-to-citc-alias)) + (general-define-key + :prefix "<SPC>" + :states '(normal) + "Gs" #'fig-status + "Cs" #'google-stuff/open-buffer-in-cs + "jc" #'google-stuff/jump-to-citc-alias)) (provide 'google-stuff) ;;; google-stuff.el ends here |