From ec21e072a1d1471adadc0ca8646b79d0480482aa Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Sat, 18 Jan 2020 22:52:59 +0000
Subject: [PATCH] Prefer general to evil-leader

Another small step towards dropping support for evil-leader, which general
supplants.
---
 configs/shared/.emacs.d/wpc/bookmark.el     | 18 +++++++++++-------
 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 60759a841..7f912f1b1 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 f2632f788..96c805659 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