From eaf91b1cbd133aedb98a5f7ab87ebfcc86654f4f Mon Sep 17 00:00:00 2001
From: MitchMarq42 <dr.m.perseos@gmail.com>
Date: Wed, 24 Aug 2022 19:26:50 -0800
Subject: [PATCH] Do a whole bunch of eshell stuff, consolidate settings file

---
 lisp/eshell-settings.el | 19 -------------------
 lisp/mitch-packages.el  | 33 +++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 lisp/eshell-settings.el

diff --git a/lisp/eshell-settings.el b/lisp/eshell-settings.el
deleted file mode 100644
index 3a34977..0000000
--- a/lisp/eshell-settings.el
+++ /dev/null
@@ -1,19 +0,0 @@
-;;; eshell-settings --- settings for eshell.
-;;; Commentary:
-;; the elisp linter wants me to put some text here so I guess I will
-
-;;; Code:
-(require 'eshell)
-(defun eshell/emacs (&rest args)
-  "Basically you can edit ARGS and it will open in a new buffer.
-When your shell is Emacs, your Emacs is but an oyster...
-This is taken from a website that I can't remember at the moment."
-  (if (null args)
-      (bury-buffer)
-    (mapc
-     #'find-file-other-window
-     (mapcar
-      #'expand-file-name (flatten-tree (reverse args))))))
-
-(provide 'eshell-settings)
-;;; eshell-settings.el ends here
diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 77e568c..d60ce24 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -44,17 +44,38 @@ NAME and ARGS are in `use-package'."
   :custom
   (whitespace-style '(face lines-tail))
   (whitespace-line-column 80)
-(use-package eshell
+  :hook (prog-mode . whitespace-mode)
+  ;; :config (global-whitespace-mode t)
+  )
+(use-feature eshell
   :straight (:type built-in)
   :commands (eshell/emacs eshell/man)
+  :custom (eshell-scroll-to-bottom-on-input t)
   :config
-  (require 'eshell)
-  (require 'em-unix)
-  (require 'eshell-settings))
-(use-package eshell-vterm
+  (add-to-list 'eshell-modules-list 'eshell-rebind)
+  (defun eshell/emacs (&rest args)
+    "Basically you can edit ARGS and it will open in a new buffer.
+When your shell is Emacs, your Emacs is but an oyster...
+This is taken from a website that I can't remember at the moment."
+    (if (null args)
+	(bury-buffer)
+      (mapc
+       #'find-file-other-window
+       (mapcar
+	#'expand-file-name (flatten-tree (reverse args)))))))
+(elpaca-use-package eshell-vterm
+  :after eshell
   :custom (eshell-destroy-buffer-when-process-dies t)
   :hook (eshell-mode . eshell-vterm-mode))
-(use-package ibuffer
+(elpaca-use-package eshell-syntax-highlighting
+  :hook (eshell-mode . eshell-syntax-highlighting-mode))
+(elpaca-use-package eshell-prompt-extras
+  :after eshell
+  :custom
+  (eshell-highlight-prompt nil)
+  (eshell-prompt-function 'epe-theme-multiline-with-status)
+  (epe-path-style 'full))
+(use-feature ibuffer
   :straight (:type built-in)
   :commands ibuffer
   :custom (ibuffer-use-other-window t))