refactor: use keymap[-global]-set instead of define-key

core/me-builtin.el

@@ -12,8 +12,8 @@
   :straight (:type built-in)
   :config
   ;; Map ESC and q to quit transient
-  (define-key transient-map [escape]  #'transient-quit-one)
-  (define-key transient-map (kbd "q") #'transient-quit-one))
+  (keymap-set transient-map "<escape>" 'transient-quit-one)
+  (keymap-set transient-map "q" 'transient-quit-one))
 
 (use-package map
   :straight (:type built-in))

core/me-completion.el

@@ -30,8 +30,8 @@
   (corfu-auto-delay 0.2)
   :config
   (with-eval-after-load 'evil
-    (define-key corfu-map (kbd "C-j") #'corfu-next)
-    (define-key corfu-map (kbd "C-k") #'corfu-previous))
+    (keymap-set corfu-map "C-j" 'corfu-next)
+    (keymap-set corfu-map "C-k" 'corfu-previous))
 
   (defun +corfu-enable-in-minibuffer ()
     "Enable Corfu in the minibuffer if `completion-at-point' is bound."
@@ -47,9 +47,9 @@
   (corfu-popupinfo-delay 0.1)
   (corfu-popupinfo-max-height 15)
   :config
-  (define-key corfu-map (kbd "M-p") #'corfu-popupinfo-scroll-down)
-  (define-key corfu-map (kbd "M-n") #'corfu-popupinfo-scroll-up)
-  (define-key corfu-map (kbd "M-d") #'corfu-popupinfo-toggle))
+  (keymap-set corfu-map "M-p" 'corfu-popupinfo-scroll-down)
+  (keymap-set corfu-map "M-n" 'corfu-popupinfo-scroll-up)
+  (keymap-set corfu-map "M-d" 'corfu-popupinfo-toggle))
 
 (use-package corfu-history
   :hook (corfu-mode . corfu-history-mode)
@@ -88,9 +88,9 @@
   ;; Better formatting for `view-register'
   (register-preview-function #'consult-register-format)
   :init
-  (define-key minibuffer-local-map (kbd "C-r") #'consult-history)
-  (define-key minibuffer-local-map (kbd "S-C-v") #'consult-yank-pop)
-  (global-set-key (kbd "C-s") #'consult-line)
+  (keymap-set minibuffer-local-map "C-r"   'consult-history)
+  (keymap-set minibuffer-local-map "C-S-v" 'consult-yank-pop)
+  (keymap-global-set "C-s" 'consult-line)
   (+map!
     ;; buffer
     "bl"  #'consult-line
@@ -169,7 +169,7 @@
 (use-package embark
   :straight t
   :init
-  (global-set-key [remap describe-bindings] #'embark-bindings)
+  (keymap-global-set "<remap> <describe-bindings>" #'embark-bindings)
   (setq prefix-help-command #'embark-prefix-help-command)
   (+map! "a" #'embark-act))
 
@@ -209,23 +209,23 @@
   ;; In the minibuffer, "C-k" is be mapped to act like "<up>". However, in
   ;; Emacs, "C-k" have a special meaning of `kill-line'. So lets map "C-S-k"
   ;; to serve the original "C-k".
-  (define-key minibuffer-local-map (kbd "C-S-k") #'kill-line)
+  (keymap-set minibuffer-local-map "C-S-k" 'kill-line)
   :config
   (with-eval-after-load 'evil
-    (define-key vertico-map (kbd "C-j") #'vertico-next)
-    (define-key vertico-map (kbd "C-k") #'vertico-previous)))
+    (keymap-set vertico-map "C-j" 'vertico-next)
+    (keymap-set vertico-map "C-k" 'vertico-previous)))
 
 (use-package vertico-directory
   :after vertico
   :demand t
   :config
-  (define-key vertico-map "\r" #'vertico-directory-enter)
-  (define-key vertico-map "\d" #'vertico-directory-delete-char)
-  (define-key vertico-map "\M-\d" #'vertico-directory-delete-word)
+  (keymap-set vertico-map "RET"   'vertico-directory-enter)
+  (keymap-set vertico-map "DEL"   'vertico-directory-delete-char)
+  (keymap-set vertico-map "M-DEL" 'vertico-directory-delete-word)
   (add-hook 'rfn-eshadow-update-overlay-hook #'vertico-directory-tidy)
 
   (with-eval-after-load 'evil
-    (define-key vertico-map (kbd "M-h") #'vertico-directory-up)))
+    (keymap-set vertico-map "M-h" 'vertico-directory-up)))
 
 (use-package vertico-repeat
   :hook (minibuffer-setup . vertico-repeat-save)

modules/extras/me-mu4e-ui.el

@@ -92,8 +92,8 @@ integer OFFSET."
                      (propertize (match-string 1 m) 'face '(mode-line-emphasis bold))))
            (replace-regexp-in-string "\t\\*" (format "\t%s" +mu4e-main-bullet) title)))
          (map (make-sparse-keymap)))
-    (define-key map [mouse-2] cmd)
-    (define-key map (kbd "RET") cmd)
+    (keymap-set map "<mouse-2>" cmd)
+    (keymap-set map "RET" cmd)
     ;; Add highlighting on mouse hover
     (put-text-property 0 (length title) 'keymap map title)
     (put-text-property (string-match "[A-Za-z].+$" title)

modules/me-extra.el

@@ -13,8 +13,8 @@
   :hook (minemacs-after-startup . better-jumper-mode)
   :config
   ;; Map extra mouse buttons to jump forward/backward
-  (global-set-key [mouse-8] #'better-jumper-jump-backward)
-  (global-set-key [mouse-9] #'better-jumper-jump-forward))
+  (keymap-global-set "<mouse-8>" 'better-jumper-jump-backward)
+  (keymap-global-set "<mouse-9>" 'better-jumper-jump-forward))
 
 (use-package crux
   :straight t

modules/me-multi-cursors.el

@@ -21,7 +21,7 @@
   :demand t
   :config
   ;; Use the `iedit' key to trigger `evil-iedit-state/iedit-mode'.
-  (define-key global-map iedit-toggle-key-default #'evil-iedit-state/iedit-mode))
+  (keymap-global-set (key-description iedit-toggle-key-default) 'evil-iedit-state/iedit-mode))
 
 (use-package evil-mc
   :straight t

modules/me-tools.el

@@ -41,7 +41,7 @@
   (vterm-max-scrollback 5000)
   (vterm-tramp-shells '(("docker" "/bin/bash")))
   :config
-  (define-key vterm-mode-map [return] #'vterm-send-return))
+  (keymap-set vterm-mode-map "<return>" 'vterm-send-return))
 
 (use-package multi-vterm
   :straight t

modules/obsolete/me-projectile.el

@@ -22,9 +22,9 @@
   (projectile-globally-ignored-file-suffixes '(".elc" ".eln" ".pyc" ".o"))
   (projectile-kill-buffers-filter 'kill-only-files)
   :init
-  (global-set-key [remap find-tag] #'projectile-find-tag)
+  (keymap-global-set "<remap> <find-tag>" 'projectile-find-tag)
   (with-eval-after-load 'evil
-    (global-set-key [remap evil-jump-to-tag] #'projectile-find-tag))
+    (keymap-global-set "<remap> <evil-jump-to-tag>" 'projectile-find-tag))
   (+map!
     ;; Project
     :infix "p"