diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index 4c4c62140..d875ad6ff 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -162,27 +162,26 @@
   :defer 1
   :commands evilem-define
   :config
-  (defvar +evil--snipe-repeat-fn)
+  (let ((prefix "g SPC"))
+    (evilem-default-keybindings prefix)
+    (evilem-define (kbd (concat prefix " n")) #'evil-ex-search-next)
+    (evilem-define (kbd (concat prefix " N")) #'evil-ex-search-previous)
+    (evilem-define (kbd (concat prefix " s")) 'evil-snipe-repeat
+                   :pre-hook (save-excursion (call-interactively #'evil-snipe-s))
+                   :bind ((evil-snipe-scope 'buffer)
+                          (evil-snipe-enable-highlight)
+                          (evil-snipe-enable-incremental-highlight)))
+    (evilem-define (kbd (concat prefix " S")) #'evil-snipe-repeat-reverse
+                   :pre-hook (save-excursion (call-interactively #'evil-snipe-s))
+                   :bind ((evil-snipe-scope 'buffer)
+                          (evil-snipe-enable-highlight)
+                          (evil-snipe-enable-incremental-highlight))))
 
-  (evilem-default-keybindings "g SPC")
-  (evilem-define (kbd "g SPC n") #'evil-ex-search-next)
-  (evilem-define (kbd "g SPC N") #'evil-ex-search-previous)
-  (evilem-define "gs" #'evil-snipe-repeat
-                 :pre-hook (save-excursion (call-interactively #'evil-snipe-s))
-                 :bind ((evil-snipe-scope 'buffer)
-                        (evil-snipe-enable-highlight)
-                        (evil-snipe-enable-incremental-highlight)))
-  (evilem-define "gS" #'evil-snipe-repeat-reverse
-                 :pre-hook (save-excursion (call-interactively #'evil-snipe-s))
-                 :bind ((evil-snipe-scope 'buffer)
-                        (evil-snipe-enable-highlight)
-                        (evil-snipe-enable-incremental-highlight)))
-
-  (setq +evil--snipe-repeat-fn
-        (evilem-create #'evil-snipe-repeat
-                       :bind ((evil-snipe-scope 'whole-buffer)
-                              (evil-snipe-enable-highlight)
-                              (evil-snipe-enable-incremental-highlight)))))
+  (defvar +evil--snipe-repeat-fn
+    (evilem-create #'evil-snipe-repeat
+                   :bind ((evil-snipe-scope 'whole-buffer)
+                          (evil-snipe-enable-highlight)
+                          (evil-snipe-enable-incremental-highlight)))))
 
 
 (def-package! evil-embrace