awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-07 12:47:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(evil): evil-collection: simplify init

Browse Source 
We've used a bunch of hackery to further lazy load evil-collection, but
it seems those aren't needed anymore (at least on 30.1+), so as an
experiment I fall back to relying on evil-collection-init (possibly
switching to `evil-collection-setup` later).
This commit is contained in:
Henrik Lissner
2025-03-25 00:32:55 -04:00
parent bdd3701987
commit 2f7f37d49b
2 changed files with 31 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/editor/evil/config.el
View File

@ -14,6 +14,7 @@ directives. By default, this only recognizes C directives.")
;; Set these defaults before `evil'; use `defvar' so they can be changed prior
;; to loading.
(defvar evil-want-keybinding (not (modulep! +everywhere)))
(defvar evil-want-C-g-bindings t)
(defvar evil-want-C-i-jump nil) ; we do this ourselves
(defvar evil-want-C-u-scroll t) ; moved the universal arg to <leader> u
@ -186,6 +187,36 @@ directives. By default, this only recognizes C directives.")
(after! evil-ex (load! "+commands")))
(use-package! evil-collection
:after evil
:when (modulep! +everywhere)
:unless noninteractive
:unless (doom-context-p 'reload)
:hook (doom-after-modules-config . evil-collection-init)
:init
(defvar evil-collection-company-use-tng (modulep! :completion company +tng))
(defvar evil-collection-setup-minibuffer nil)
(defvar evil-collection-want-unimpaired-p nil) ; we have our own
;; We bind goto-reference on gD and goto-assignments on gA ourselves
(defvar evil-collection-want-find-usages-bindings-p nil)
;; Reduces keybind conflicts between outline-mode and org-mode (which is
;; derived from outline-mode).
(defvar evil-collection-outline-enable-in-minor-mode-p nil)
:config
(setq evil-collection-key-blacklist
(append (list doom-leader-key doom-localleader-key
doom-leader-alt-key)
evil-collection-key-blacklist
(if (modulep! :tools lookup) '("gd" "gf" "K"))
(if (modulep! :tools eval) '("gr" "gR"))
'("[" "]" "gz" "<escape>")))
(defadvice! +evil-collection-disable-blacklist-a (fn)
:around #'evil-collection-vterm-toggle-send-escape ; allow binding to ESC
(let (evil-collection-key-blacklist)
(funcall-interactively fn))))
;;
;;; Packages