Move setup-defines into acdw-setup.el

1 files changed, 1 insertions, 38 deletions

@@ -194,44 +194,7 @@ say, `tool-bar-mode' once to toggle the tool bar back on."
 ;;; `setup'
 (straight-use-package '(setup :host nil :repo "https://git.sr.ht/~pkal/setup"))
 (require 'setup)
-
-(setup setup
-  ;; Install a package using `straight-use-package'
-  (setup-define :straight
-    (lambda (recipe)
-      `(straight-use-package ',recipe))
-    :documentation
-    "Install RECIPE with `straight-use-package'.
-This macro can be used as HEAD, and will replace itself with the
-first RECIPE's package."
-    :repeatable t
-    :shorthand (lambda (sexp)
-                 (let ((recipe (cadr sexp)))
-                   (if (consp recipe)
-                       (car recipe)
-                     recipe))))
-  ;; Install a package with straight, but only under a condition
-  (setup-define :straight-if
-    (lambda (recipe condition)
-      `(if ,condition
-           (straight-use-package ',recipe)
-         ,(setup-quit)))
-    :documentation
-    "Install RECIPE with `straight-use-package' when CONDITION is met.
-If CONDITION is false, stop evaluating the body.  This macro can
-be used as HEAD, and will replace itself with the RECIPE's
-package.  This macro is not repeatable."
-    :repeatable nil
-    :shorthand (lambda (sexp)
-                 (let ((recipe (cadr sexp)))
-                   (if (consp recipe) (car recipe) recipe))))
-  ;; Hotfix
-  (setup-define :file-match
-    (lambda (pat)
-      `(add-to-list 'auto-mode-alist (cons ,pat ',(setup-get 'mode))))
-    :documentation "Associate the current mode with files that match PAT."
-    :debug '(form)
-    :repeatable t))
+(require 'acdw-setup)
 
 ;;; `no-littering'
 (setup (:straight no-littering)