From 884343deb4c9c7837356b27968c1e594d8730d49 Mon Sep 17 00:00:00 2001
From: Case Duckworth
Date: Fri, 12 Mar 2021 17:32:13 -0600
Subject: Add `:set', `:local', `:require' keywords to `acdw/pkg'

---
 init.el | 51 ++++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 6940b6c..c4d8664 100644
--- a/init.el
+++ b/init.el
@@ -199,7 +199,7 @@
 	      (icomplete-with-buffer-completion-tables t)
 	      (icomplete-in-buffer t)))
   (acdw/pkg orderless
-    :now ((acdw/set '((completion-styles (orderless))))))
+    :set '((completion-styles (orderless))))
   (acdw/pkg icomplete-vertical
     :binds (("<down>" icomplete-forward-completions
 		      :map icomplete-minibuffer-map)
@@ -247,15 +247,15 @@
 	  ("M-y" consult-yank-pop)
 	  ("<f1> a" consult-apropos)
 	  ("C-h a" consult-apropos))
-  :now ((autoload 'consult-register-preview "consult")
-	(acdw/set '((register-preview-delay 0)
-		    (register-preview-function #'consult-register-preview)))))
+  :now ((autoload 'consult-register-preview "consult"))
+  :set '((register-preview-delay 0)
+	 (register-preview-function #'consult-register-preview)))
 
 ;; Marginalia
 (acdw/pkg marginalia
-  :now ((acdw/set '((marginalia-annotators (marginalia-annotators-heavy
-					    marginalia-annotators-light))))
-	(marginalia-mode +1)))
+  :set '((marginalia-annotators (marginalia-annotators-heavy
+				 marginalia-annotators-light)))
+  :now ((marginalia-mode +1)))
 
 ;; Imenu
 (when (require 'imenu)
@@ -268,36 +268,25 @@
   :binds (("C-/" undo-fu-only-undo)
 	  ("C-?" undo-fu-only-redo)))
 (acdw/pkg undo-fu-session
-  :now ((acdw/set `((undo-fu-session-incompatible-files ("/COMMIT_EDITMSG\\'"
-							 "/git-rebase-todo\\'"))
-		    (undo-fu-session-directory ,(acdw/in-dir "undo/" t)))))
+  :set `((undo-fu-session-incompatible-files ("/COMMIT_EDITMSG\\'"
+					      "/git-rebase-todo\\'"))
+	 (undo-fu-session-directory ,(acdw/in-dir "undo/" t)))
   :then ((global-undo-fu-session-mode +1)))
 
 ;; Modus themes
 (acdw/pkg (modus-themes
 	   :host gitlab
 	   :repo "protesilaos/modus-themes")
-  :now ((acdw/set `((modus-themes-slanted-constructs t)
-		    (modus-themes-bold-constructs t)
-		    (modus-themes-region 'bg-only)
-		    (modus-themes-org-blocks 'grayscale)
-		    (modus-themes-headings ((1 . section)
-					    (t . no-color)))
-		    (modus-themes-scale-headings nil)
-		    (modus-themes-mode-line nil)))
-	(acdw/sunrise-sunset #'modus-themes-load-operandi
-			     #'modus-themes-load-vivendi))
-  :then
-  ((dolist (face '(modus-theme-heading-1
-		   modus-theme-heading-2
-		   modus-theme-heading-3
-		   modus-theme-heading-4
-		   modus-theme-heading-5
-		   modus-theme-heading-6
-		   modus-theme-heading-7
-		   modus-theme-heading-8))
-     (acdw/set-face face
-		    `((t (:inherit (fixed-pitch bold))))))))
+  :set `((modus-themes-slanted-constructs t)
+	 (modus-themes-bold-constructs t)
+	 (modus-themes-region 'bg-only)
+	 (modus-themes-org-blocks 'grayscale)
+	 (modus-themes-headings ((1 . section)
+				 (t . no-color)))
+	 (modus-themes-scale-headings nil)
+	 (modus-themes-mode-line nil))
+  :now ((acdw/sunrise-sunset #'modus-themes-load-operandi
+			     #'modus-themes-load-vivendi)))
 
 ;;; Mode line
 
-- 
cgit 1.4.1-21-gabe81