refactor: use use-package's :bind to bind keys

core/me-builtin.el

@@ -1751,19 +1751,26 @@ Useful for quickly switching to an open buffer."
 
 (use-package transient
   :straight (:type built-in)
-  :config
   ;; Map ESC and q to quit transient
-  (keymap-set transient-map "<escape>" 'transient-quit-one)
-  (keymap-set transient-map "q" 'transient-quit-one))
+  :bind (:map transient-map
+         ("q" . transient-quit-one)
+         ("<escape>" . transient-quit-one)))
 
 (use-package isearch
   :straight (:type built-in)
-  :config
   ;; Scroll in isearch history using UP/DOWN or C-j/C-k
-  (keymap-set isearch-mode-map "C-j" #'isearch-ring-advance)
-  (keymap-set isearch-mode-map "C-k" #'isearch-ring-retreat)
-  (keymap-set isearch-mode-map "<down>" #'isearch-ring-advance)
-  (keymap-set isearch-mode-map "<up>" #'isearch-ring-retreat))
+  :bind (:map isearch-mode-map
+         ("C-k" . isearch-ring-retreat)
+         ("C-j" . isearch-ring-advance)
+         ("<up>" . isearch-ring-retreat)
+         ("<down>" . isearch-ring-advance)))
+
+(use-package face-remap
+  :straight (:type built-in)
+  :bind (("C-+" . text-scale-increase)
+         ("C--" . text-scale-decrease)
+         ("C-=" . text-scale-adjust)))
+
 
 (provide 'me-builtin)
 

core/me-completion.el

@@ -77,22 +77,20 @@ This depends on `+cape-hosts' and `+cape-global-capes'."
   :hook (minemacs-after-startup . global-corfu-mode)
   :hook (eshell-mode . +corfu-less-intrusive-h)
   :hook (minibuffer-setup . +corfu-enable-in-minibuffer-h)
+  :bind (:map corfu-map
+         ("M-m" . +corfu-complete-in-minibuffer)
+         ("<tab>" . corfu-next)
+         ("<backtab>" . corfu-previous)
+         ("C-j" . corfu-next)
+         ("C-k" . corfu-previous))
   :init
-  (add-to-list
-   'load-path
-   (format "%sstraight/%s/corfu/extensions" straight-base-dir straight-build-dir))
+  (add-to-list 'load-path (format "%sstraight/%s/corfu/extensions" straight-base-dir straight-build-dir))
   :custom
   (corfu-auto t) ; Enable auto completion
   (corfu-cycle t) ; Allows cycling through candidates
   (corfu-min-width 25)
   (corfu-auto-delay 0.2)
   :config
-  (keymap-set corfu-map "C-j" 'corfu-next)
-  (keymap-set corfu-map "<tab>" 'corfu-next)
-  (keymap-set corfu-map "C-k" 'corfu-previous)
-  (keymap-set corfu-map "<backtab>" 'corfu-previous)
-  (keymap-set corfu-map "M-m" '+corfu-complete-in-minibuffer)
-
   (defun +corfu-enable-in-minibuffer-h ()
     "Enable Corfu in the minibuffer if `completion-at-point' is bound."
     (when (where-is-internal #'completion-at-point (list (current-local-map)))
@@ -117,13 +115,13 @@ This depends on `+cape-hosts' and `+cape-global-capes'."
 
 (use-package corfu-popupinfo
   :hook (corfu-mode . corfu-popupinfo-mode)
+  :bind (:map corfu-map
+         ("M-p" . corfu-popupinfo-scroll-down)
+         ("M-n" . corfu-popupinfo-scroll-up)
+         ("M-d" . corfu-popupinfo-toggle))
   :custom
   (corfu-popupinfo-delay 0.1)
-  (corfu-popupinfo-max-height 15)
-  :config
-  (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))
+  (corfu-popupinfo-max-height 15))
 
 (use-package corfu-history
   :hook (corfu-mode . corfu-history-mode)
@@ -146,15 +144,16 @@ This depends on `+cape-hosts' and `+cape-global-capes'."
 (use-package consult
   :straight t
   :hook (embark-collect-mode . consult-preview-at-point-mode)
+  :bind (("C-s" . consult-line)
+         :map minibuffer-local-map
+         ("C-r" . consult-history)
+         ("C-S-v" . consult-yank-pop))
   :custom
   ;; Use `consult-xref' for `xref-find-references'
   (xref-show-xrefs-function #'consult-xref)
   ;; Better formatting for `view-register'
   (register-preview-function #'consult-register-format)
   :init
-  (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
     "bll" #'consult-line
@@ -213,8 +212,8 @@ This depends on `+cape-hosts' and `+cape-global-capes'."
 
 (use-package embark
   :straight t
+  :bind ("<remap> <describe-bindings>" . embark-bindings)
   :init
-  (keymap-global-set "<remap> <describe-bindings>" #'embark-bindings)
   ;; Use Embark to show bindings in a key prefix with `C-h`
   (setq prefix-help-command #'embark-prefix-help-command)
   (+map! "a" #'embark-act))
@@ -243,40 +242,34 @@ This depends on `+cape-hosts' and `+cape-global-capes'."
 (use-package vertico
   :straight t
   :hook (minemacs-after-startup . vertico-mode)
+  ;; 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".
+  :bind (:map minibuffer-local-map
+         ("C-S-k" . kill-line)
+         :map vertico-map
+         ("C-j" . vertico-next)
+         ("C-k" . vertico-previous))
   :custom
   (vertico-cycle t)
   (vertico-resize nil)
   (vertico-count 12)
   :init
-  (add-to-list
-   'load-path (concat
-               straight-base-dir
-               (format "straight/%s/vertico/extensions" straight-build-dir)))
-  ;; 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".
-  (keymap-set minibuffer-local-map "C-S-k" 'kill-line)
-  :config
-  (with-eval-after-load 'evil
-    (keymap-set vertico-map "C-j" 'vertico-next)
-    (keymap-set vertico-map "C-k" 'vertico-previous)))
+  (add-to-list 'load-path (concat straight-base-dir (format "straight/%s/vertico/extensions" straight-build-dir))))
 
 (use-package vertico-directory
   :after vertico
   :demand t
-  :config
-  (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
-    (keymap-set vertico-map "M-h" 'vertico-directory-up)))
+  :hook (rfn-eshadow-update-overlay . vertico-directory-tidy)
+  :bind (:map vertico-map
+              ("RET" . vertico-directory-enter)
+              ("DEL" . vertico-directory-delete-char)
+              ("M-DEL" . vertico-directory-delete-word)
+              ("M-h" . vertico-directory-up)))
 
 (use-package vertico-repeat
   :hook (minibuffer-setup . vertico-repeat-save)
-  :init
-  (keymap-global-set "M-R" #'vertico-repeat))
+  :bind ("M-R" . vertico-repeat))
 
 
 (provide 'me-completion)

core/me-keybindings.el

@@ -211,11 +211,6 @@
     :global-prefix minemacs-global-mode-prefix
     "u" #'universal-argument-more)
 
-  ;; Text zooming keybindings
-  (keymap-global-set "C-+" #'text-scale-increase)
-  (keymap-global-set "C--" #'text-scale-decrease)
-  (keymap-global-set "C-=" #'text-scale-adjust)
-
   (when (or os/linux os/bsd)
     (when (executable-find "netExtender")
       (+map! "tV"  #'netextender-toggle))

modules/me-editor.el

@@ -110,10 +110,10 @@
 (use-package drag-stuff
   :straight t
   :init
-  (keymap-global-set "M-S-<up>" 'drag-stuff-up)
-  (keymap-global-set "M-S-<down>" 'drag-stuff-down)
-  (keymap-global-set "M-S-<left>" 'drag-stuff-left)
-  (keymap-global-set "M-S-<right>" 'drag-stuff-right))
+  :bind (("M-S-<up>" . drag-stuff-up)
+         ("M-S-<down>" . drag-stuff-down)
+         ("M-S-<left>" . drag-stuff-left)
+         ("M-S-<right>" . drag-stuff-right)))
 
 ;; Bind `+yank-region-as-paragraph' (autoloaded from "elisp/+buffer.el")
 (+nvmap! "gy" #'+kill-region-as-paragraph)

modules/me-extra.el

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

modules/me-tools.el

@@ -41,6 +41,7 @@
   :straight t
   :when (and (not os/win) (+emacs-features-p 'modules))
   :hook (minemacs-build-functions . vterm-module-compile)
+  :bind (:map vterm-mode-map ("<return>" . vterm-send-return))
   :init
   (+map!
     "ot" '(nil :wk "vterm")
@@ -54,9 +55,7 @@
   :custom
   (vterm-always-compile-module t)
   (vterm-max-scrollback 5000)
-  (vterm-tramp-shells '(("docker" "/bin/bash")))
-  :config
-  (keymap-set vterm-mode-map "<return>" 'vterm-send-return))
+  (vterm-tramp-shells '(("docker" "/bin/bash"))))
 
 (use-package multi-vterm
   :straight t