Use spacemacs/set-leader-keys in the bepo layer

layers/+keyboard-layouts/bepo/funcs.el

@@ -102,19 +102,15 @@ evil states, except insert."
   (declare (indent 0))
   (bepo//define-key bepo--all-evil-states-but-insert key def bindings))
 
-(defun bepo/evil-leader-alias-of (key1 key2)
-  "Define a evil-leader key as an alias of another one."
-  (evil-leader/set-key key1 (lookup-key spacemacs-default-map key2)))
+(defun bepo/leader-alias-of (key1 key2)
+  "Define a leader key as an alias of another one."
+  (spacemacs/set-leader-keys key1 (lookup-key spacemacs-default-map key2)))
 
-(defun bepo/evil-leader-alias-of (key1 key2)
-  "Define a evil-leader key as an alias of another one."
-  (evil-leader/set-key key1 (lookup-key spacemacs-default-map key2)))
-
-(defun bepo/evil-leader-swap-keys (key1 key2)
-  "Invert the behaviour of two evil-leader keys."
+(defun bepo/leader-swap-keys (key1 key2)
+  "Invert the behaviour of two leader keys."
   (let ((map1 (lookup-key spacemacs-default-map key1))
         (map2 (lookup-key spacemacs-default-map key2)))
-    (evil-leader/set-key key1 map2 key2 map1)))
+    (spacemacs/set-leader-keys key1 map2 key2 map1)))
 
 ;;------------------------------------------------------------------------------
 ;; CORRECTION FUNCTIONS
@@ -129,7 +125,7 @@ evil states, except insert."
   (declare (indent 2))
   (apply #'bepo/correct-keys (evil-get-auxiliary-keymap map state) keys))
 
-(defun bepo/evil-leader-correct-keys (&rest keys)
+(defun bepo/leader-correct-keys (&rest keys)
   (declare (indent 0))
   (apply #'bepo/correct-keys spacemacs-default-map keys))
 

layers/+keyboard-layouts/bepo/keybindings.el

@@ -20,7 +20,7 @@
   (progn
     ;; HACK: Manual binding, otherwise conflicts with evil-window auto
     ;; remapping.
-    (evil-leader/set-key
+    (spacemacs/set-leader-keys
       "wC" 'evil-window-move-far-left
       "wL" 'ace-delete-window
       "wQ" 'ace-delete-window)
@@ -40,7 +40,7 @@
   :loader
   (with-eval-after-load 'buffer-move BODY)
   :config
-  (bepo/evil-leader-correct-keys
+  (bepo/leader-correct-keys
     "bmh"
     "bmj"
     "bmk"
@@ -153,7 +153,7 @@
    `q' for closing."
   :config
   (progn
-    (bepo/evil-leader-correct-keys
+    (bepo/leader-correct-keys
      "wh"
      "wj"
      "wk"
@@ -166,7 +166,7 @@
     (spacemacs/set-leader-keys
       "wé" 'other-window
       "wq" 'delete-window)
-    (bepo/evil-leader-alias-of "é" "w")))
+    (bepo/leader-alias-of "é" "w")))
 
 (bepo|config eyebrowse
   :description
@@ -360,7 +360,7 @@
   :description
   "Customize some `spacemacs' bindings."
   :config
-  (bepo/evil-leader-correct-keys
+  (bepo/leader-correct-keys
     "jh"
     "jj"
     "jk"