3 files changed, 11 insertions, 33 deletions
diff --git a/config/init-eshell.el b/config/init-eshell.el
index 3eb2175..286e180 100644
--- a/config/init-eshell.el
+++ b/config/init-eshell.el
@@ -31,21 +31,9 @@
      eshell-term
      eshell-unix
      eshell-xtra))
-  (eshell-prompt-function
-   (lambda nil
-     (concat (abbreviate-file-name (eshell/pwd))
-             (if (= (user-uid) 0)
-                 " # " " $ "))))
   (eshell-save-history-on-exit t)
   (eshell-stringify-t nil)
-  (eshell-term-name "ansi")
-
-  :preface
-  (defun eshell-initialize ()
-    (add-hook 'eshell-expand-input-functions #'eshell-spawn-external-command)
-
-  :init
-  (add-hook 'eshell-first-time-mode-hook #'eshell-initialize)))
+  (eshell-term-name "ansi"))
 
 (provide 'init-eshell)
 
diff --git a/config/init-imenu.el b/config/init-imenu.el
index 24f71f9..7f45434 100644
--- a/config/init-imenu.el
+++ b/config/init-imenu.el
@@ -7,16 +7,9 @@
 
 ;;; Code:
 
-;;; imenu
-(with-eval-after-load 'imenu
-  ;; Recenter buffer after jumping.
-  (add-hook
-   'imenu-after-jump-hook
-   (lambda () (recenter (max scroll-margin (/ (window-height) 3)))))
-
-  (setq-default imenu-auto-rescan t)
-  (setq-default imenu-auto-rescan-maxout (* 1024 1024))
-  (setq-default imenu--rescan-item '("" . -99)))
+(use-package imenu
+  :config
+  (setq imenu-auto-rescan t))
 
 (provide 'init-imenu)
 
diff --git a/config/init-project.el b/config/init-project.el
index 34928c5..f70bc02 100644
--- a/config/init-project.el
+++ b/config/init-project.el
@@ -9,16 +9,13 @@
 
 (require 'init-util)
 
-(require 'project)
-
-(with-eval-after-load 'project
-  (define-key project-prefix-map (kbd "v") 'magit-status))
-
-(global-set-key (kbd "C-x p b") 'consult-project-buffer)
-
-(setq project-switch-commands
-      (append '((magit-status "Magit status"))
-              project-switch-commands))
+(use-package project
+  :config
+  (setq project-switch-commands
+        '((project-find-file "Find file" f)
+          (project-dired "Dired" d)
+          (project-eshell "Eshell" e)
+          (magit-project-status "Magit" ?m))))
 
 (setq-default project-list-file (user-data "projects.eld"))