From 594d70292dc134d483fbf7a427001250de07b4d2 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 24 Sep 2022 22:04:52 +0200 Subject: [PATCH] refactor: remove use-package from doom-keybinds.el One step toward a use-package-less future. Ref: dda848e08930 --- lisp/doom-keybinds.el | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lisp/doom-keybinds.el b/lisp/doom-keybinds.el index 62381605c..068c75457 100644 --- a/lisp/doom-keybinds.el +++ b/lisp/doom-keybinds.el @@ -116,15 +116,12 @@ all hooks after it are ignored.") ;; ;;; General + leader/localleader keys -(use-package general - :init - ;; Convenience aliases - (defalias 'define-key! #'general-def) - (defalias 'undefine-key! #'general-unbind) - :config - ;; Prevent "X starts with non-prefix key Y" errors except at startup. - (add-hook 'doom-after-modules-config-hook #'general-auto-unbind-keys)) - +(require 'general) +;; Convenience aliases +(defalias 'define-key! #'general-def) +(defalias 'undefine-key! #'general-unbind) +;; Prevent "X starts with non-prefix key Y" errors except at startup. +(add-hook 'doom-after-init-modules-hook #'general-auto-unbind-keys) ;; HACK: `map!' uses this instead of `define-leader-key!' because it consumes ;; 20-30% more startup time, so we reimplement it ourselves.