From 534b8ccba38690a1fe460b076569594c26f82d47 Mon Sep 17 00:00:00 2001
From: MitchMarq42 <dr.m.perseos@gmail.com>
Date: Sun, 17 Jul 2022 10:50:11 -0800
Subject: [PATCH] use `dirvish` file manager; dirvish and magit vterm commands

---
 lisp/mitch-packages.el | 69 +++++++++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 24 deletions(-)

diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 0373a5f..b84cb8a 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -43,14 +43,6 @@
   :commands ibuffer
   :custom
   (ibuffer-use-other-window t))
-(use-package dired
-  :straight (:type built-in)
-  :commands dired
-  :custom
-  (dired-always-read-filesystem t)
-  (dired-vc-rename-file t)
-  :hook (dired-mode . dired-hide-details-mode)
-  (dired-mode . wdired-mode))
 (use-package image-mode
   :straight (:type built-in)
   :config
@@ -113,6 +105,33 @@
   :if (< (string-to-number emacs-version) 28)
   :diminish)
 
+(use-package all-the-icons)
+(use-package dirvish
+  :straight (:files (:defaults "extensions/*.el"))
+  :commands 'dirvish
+  :init (dirvish-override-dired-mode)
+  (setq dirvish-attributes '(all-the-icons collapse))
+  (dirvish-define-preview exa (file)
+    "Use `exa' to generate directory preview."
+    :require ("exa") ; tell Dirvish to check if we have the executable
+    (when (file-directory-p file) ; we only interest in directories here
+      `(shell . ("exa" "--color=always" "-al" ,file)))) ; use the command output as preview
+  (add-to-list 'dirvish-preview-dispatchers 'exa)
+  (setq dired-listing-switches "-l --almost-all")
+  :hook (dirvish-mode . turn-off-line-numbers)
+  :general
+  (general-define-key
+   :states 'normal
+   :keymaps '(dirvish-mode-map local)
+   "h" 'dired-up-directory
+   "l" 'dired-find-file
+   "/" 'dirvish-narrow)
+  (general-define-key
+   :states 'normal
+   :prefix-command 'file-tree-map-prefix
+   :prefix-map 'file-tree-map
+   :prefix "SPC t"
+   "t" 'dirvish-side))
 ;; Completion framework...
 ;; (use-package ivy
 ;;   :diminish
@@ -230,6 +249,8 @@
 	  "find-file-other-frame"
 	  "eshell/emacs"
 	  "eshell/man"
+	  "dirvish"
+	  "magit"
 	  "info-other-window"
 	  "add-vterm-eval-cmd"))
   (defun add-vterm-eval-cmd (function)
@@ -493,22 +514,22 @@
   :commands esup)
 
 ;; Blingy file tree view
-(use-package treemacs
-  :general (general-define-key
-            :states 'normal
-            :prefix-command 'treemacs-map-prefix
-            :prefix-map 'treemacs-map
-            :prefix "SPC t"
-            "t" 'treemacs)
-  :config
-  (treemacs-project-follow-mode)
-  (treemacs-git-mode 'simple)
-  :hook
-  (treemacs-mode . turn-off-line-numbers))
-(use-package treemacs-evil
-  :after treemacs)
-(use-package treemacs-all-the-icons
-  :after treemacs)
+;; (use-package treemacs
+;;   :general (general-define-key
+;;             :states 'normal
+;;             :prefix-command 'treemacs-map-prefix
+;;             :prefix-map 'treemacs-map
+;;             :prefix "SPC t"
+;;             "t" 'treemacs)
+;;   :config
+;;   (treemacs-project-follow-mode)
+;;   (treemacs-git-mode 'simple)
+;;   :hook
+;;   (treemacs-mode . turn-off-line-numbers))
+;; (use-package treemacs-evil
+;;   :after treemacs)
+;; (use-package treemacs-all-the-icons
+;;   :after treemacs)
 
 ;; Blingy laggy minimap on the right
 (use-package minimap