From 0674e4b4b05d343125c279c04c7ae9f8dfd1375a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 18 May 2019 15:55:15 -0400
Subject: [PATCH] Remove :emacs imenu module

Some of it was moved into core as reasonable defaults, but the rest of
it doesn't warrant a whole module dedicated to it.
---
 core/core-editor.el                      |  7 +++++++
 init.example.el                          |  1 -
 modules/config/default/+evil-bindings.el |  3 ---
 modules/emacs/imenu/config.el            | 13 -------------
 modules/emacs/imenu/packages.el          |  5 -----
 5 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 modules/emacs/imenu/config.el
 delete mode 100644 modules/emacs/imenu/packages.el

diff --git a/core/core-editor.el b/core/core-editor.el
index 5fd4332b8..2a847d792 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -253,6 +253,13 @@ savehist file."
          (helpful-variable (button-get button 'apropos-symbol)))))))
 
 
+(def-package! imenu
+  :defer t
+  :config
+  (add-hook 'imenu-after-jump-hook #'better-jumper-set-jump)
+  (add-hook 'imenu-after-jump-hook #'recenter))
+
+
 (def-package! smartparens
   ;; Auto-close delimiters and blocks as you type. It's more powerful than that,
   ;; but that is all Doom uses it for.
diff --git a/init.example.el b/init.example.el
index 7c2fcdf22..b1fd52c23 100644
--- a/init.example.el
+++ b/init.example.el
@@ -59,7 +59,6 @@
        ;;+icons          ; colorful icons for dired-mode
         )
        electric          ; smarter, keyword-based electric-indent
-       imenu             ; an imenu sidebar and searchable code index
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index d5e0c6a1f..8a74b0476 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -530,7 +530,6 @@
         :desc "Search buffer"                 "b" #'swiper
         :desc "Search current directory"      "d" #'+default/search-from-cwd
         :desc "Jump to symbol"                "i" #'imenu
-        :desc "Jump to symbol across buffers" "I" #'imenu-anywhere
         :desc "Jump to link"                  "l" #'ace-link
         :desc "Look up online"                "o" #'+lookup/online-select
         :desc "Look up in local docsets"      "k" #'+lookup/in-docsets
@@ -705,8 +704,6 @@
         (:when (featurep! :ui treemacs)
           :desc "Project sidebar" "p" #'+treemacs/toggle
           :desc "Find file in project sidebar" "P" #'+treemacs/find-file)
-        (:when (featurep! :emacs imenu)
-          :desc "Imenu sidebar" "i" #'imenu-list-smart-toggle)
         (:when (featurep! :emacs term)
           :desc "Terminal"          "t" #'+term/open
           :desc "Terminal in popup" "T" #'+term/open-popup-in-project)
diff --git a/modules/emacs/imenu/config.el b/modules/emacs/imenu/config.el
deleted file mode 100644
index 4915b1f3f..000000000
--- a/modules/emacs/imenu/config.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; emacs/imenu/config.el -*- lexical-binding: t; -*-
-
-;; `imenu-anywhere'
-(setq imenu-anywhere-delimiter ": ")
-
-(add-hook 'imenu-after-jump-hook #'better-jumper-set-jump)
-
-
-(after! imenu-list
-  (setq imenu-list-idle-update-delay 0.5)
-
-  (set-popup-rule! "^\\*Ilist"
-    :side 'right :size 35 :quit nil :select nil :ttl 0))
diff --git a/modules/emacs/imenu/packages.el b/modules/emacs/imenu/packages.el
deleted file mode 100644
index 60b3cfc93..000000000
--- a/modules/emacs/imenu/packages.el
+++ /dev/null
@@ -1,5 +0,0 @@
-;; -*- no-byte-compile: t; -*-
-;;; emacs/imenu/packages.el
-
-(package! imenu-anywhere)
-(package! imenu-list)