From 9baf3a1b556039c959f9664cc6c2796f760ef757 Mon Sep 17 00:00:00 2001
From: Benson Chu <bensonchu457@gmail.com>
Date: Sun, 16 Oct 2022 06:22:11 -0500
Subject: [PATCH] dired+ too

---
 .gitmodules          |  3 ---
 config-min.org       | 20 +++++++++++++-------
 init.el              |  3 +++
 submodule/dired-plus |  1 -
 4 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 160000 submodule/dired-plus

diff --git a/.gitmodules b/.gitmodules
index 8f33724..1ef0f4f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "custom/youtube-dl-emacs"]
 	path = submodule/youtube-dl-emacs
 	url = https://github.com/skeeto/youtube-dl-emacs
-[submodule "custom/dired-plus"]
-	path = submodule/dired-plus
-	url = https://github.com/emacsmirror/dired-plus
 [submodule "custom/bookmark-plus"]
 	path = submodule/bookmark-plus
 	url = https://github.com/emacsmirror/bookmark-plus
diff --git a/config-min.org b/config-min.org
index b618a92..a0b9f3b 100644
--- a/config-min.org
+++ b/config-min.org
@@ -210,8 +210,9 @@
 * dired
 #+begin_src emacs-lisp
   ;; I like dired+'s formatting for listing files
-  (add-to-list 'load-path
-               "~/.emacs.d/submodule/dired-plus")
+  (use-package dired+
+    :ensure nil
+    :quelpa (dired+ :fetcher "github" :repo "emacsmirror/dired-plus" :branch "master"))
   (require 'dired+)
   (setq diredp-hide-details-initially-flag nil)
   (setq diredp-hide-details-propagate-flag nil)
@@ -471,11 +472,16 @@
   (define-key emacs-lisp-mode-map (kbd "C-c C-e") 'my/eval-and-replace)
 
   ;; Use cider's eval expression
-  (quelpa-use-package-activate-advice)
-  (use-package cider
-    :ensure nil
-    :quelpa (cider :fetcher "github-ssh" :repo "pestctrl/cider" :branch "consecutive-overlays"))
-  (quelpa-use-package-deactivate-advice)
+  (let ((quelpa-build-default-files-spec
+         '("*.el" "lisp/*.el"
+           "dir" "*.info" "*.texi" "*.texinfo"
+           "doc/dir" "doc/*.info" "doc/*.texi" "doc/*.texinfo"
+           "docs/dir" "docs/*.info" "docs/*.texi" "docs/*.texinfo"
+           (:exclude
+            ".dir-locals.el" "lisp/.dir-locals.el"))))
+    (use-package cider
+      :ensure nil
+      :quelpa (cider :fetcher "github-ssh" :repo "pestctrl/cider" :branch "consecutive-overlays")))
   (autoload 'cider--make-result-overlay "cider-overlays")
 
   (defun endless/eval-overlay (value point)
diff --git a/init.el b/init.el
index 903ed70..ceee8f0 100644
--- a/init.el
+++ b/init.el
@@ -28,6 +28,9 @@
 
 (require 'org)
 (require 'use-package)
+(require 'quelpa)
+(require 'quelpa-use-package)
+
 (setq use-package-always-ensure t)
 
 ;; Add my modules
diff --git a/submodule/dired-plus b/submodule/dired-plus
deleted file mode 160000
index c89e767..0000000
--- a/submodule/dired-plus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c89e7676c3ac9ebd4ef0e0058656b6cd9d36222b