Enable all evil-collection keybindings

emacs/init.org

@@ -142,14 +142,11 @@ Make undo not undo paragraphs at a time:
 A collection of evil bindings for various modes
 #+BEGIN_SRC emacs-lisp
   (use-package evil-collection
-    :after (evil))
+    :after (evil)
+    :config
+    (evil-collection-init))
 
-  (with-eval-after-load 'dired
-    (evil-collection-dired-setup))
-  (with-eval-after-load 'image-dired
-    (evil-collection-image-dired-setup))
   (with-eval-after-load 'help
-    (evil-collection-help-setup)
     (general-def 'normal help-mode-map "SPC" leader-map))
 #+END_SRC
 
@@ -225,8 +222,6 @@ Interfacing with Pass, the "standard Unix password manager". This should also be
   (use-package pass
     :if (executable-find "pass")
     :commands pass
-    :config
-    (evil-collection-pass-setup)
     :general
     (pass-mode-map "S" #'password-store-synchronize))
 
@@ -716,8 +711,6 @@ After I select an xref reference, I want the xref buffer closed:
   (defun xref-goto-xref-and-quit ()
     (interactive)
     (xref-goto-xref t))
-  (with-eval-after-load 'xref
-    (evil-collection-xref-setup))
   (general-def 'normal xref--xref-buffer-mode-map "RET" #'xref-goto-xref-and-quit)
 #+END_SRC
 * Speedbar
@@ -832,7 +825,6 @@ A package to browse files in a tree view
     :init
     (leader-def-key "d" #'neotree-toggle)
     :config
-    (evil-collection-neotree-setup)
     (defun neotree-project-dir ()
       "Open NeoTree using the git root."
       (interactive)
@@ -2299,7 +2291,6 @@ Browsing the web from Emacs. Relies on having [[http://w3m.sourceforge.net/][w3m
 	       w3m-browse-url
 	       w3m-search-new-session)
     :config
-    (evil-collection-w3m-setup)
     (general-def 'normal w3m-mode-map "SPC" leader-map)
     (setq w3m-home-page "https://start.duckduckgo.com"
 	  w3m-search-default-engine "duckduckgo"
@@ -2615,9 +2606,6 @@ A nice Emacs UI over [[https://github.com/BurntSushi/ripgrep#installation][ripgr
     (deadgrep-mode-map "SPC" leader-map))
 
   (leader-def-key "fg" 'deadgrep)
-
-  (with-eval-after-load 'evil
-    (evil-collection-deadgrep-setup))
 #+END_SRC
 
 * RCIRC
@@ -3117,7 +3105,6 @@ Syntax highlighting for Dockerfiles:
   (use-package prodigy
     :commands (prodigy)
     :config
-    (evil-collection-prodigy-setup)
     (add-hook 'prodigy-view-mode-hook (lambda () (toggle-truncate-lines 1))))
 
   (leader-def-key "P" #'prodigy)