1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
;;; +setup.el -- my `setup' commands -*- lexical-binding: t -*-
;; Author: Case Duckworth <acdw@acdw.net>
;; This file is NOT part of GNU Emacs.
;;; License:
;; Everyone is permitted to do whatever with this software, without
;; limitation. This software comes without any warranty whatsoever,
;; but with two pieces of advice:
;; - Don't hurt yourself.
;; - Make good choices.
;;; Commentary:
;; `setup', by Philip Kaludercic, is a wonderful package that works
;; sort of like `use-package', but to my mind it's cleaner and easier
;; to extend. These are my additions to the local macros provided by
;; the package.
;;; Code:
(require 'el-patch)
(require 'setup)
(require 'straight)
(defun +setup-warn (message &rest args)
"Warn the user that something bad happened in `setup'."
(display-warning 'setup (format message args)))
(setup-define :face
(lambda (face spec)
`(custom-set-faces '(,face ,spec 'now "Customized by `setup'.")))
:documentation "Customize FACE with SPEC using `custom-set-faces'."
:repeatable t)
(setup-define :load-after
(lambda (&rest features)
(let ((body `(require ',(setup-get 'feature))))
(dolist (feature (nreverse features))
(setq body `(with-eval-after-load ',feature ,body)))
body))
:documentation "Load the current feature after FEATURES.")
(setup-define :load-from
(lambda (path)
`(let ((path* (expand-file-name ,path)))
(if (file-exists-p path*)
(add-to-list 'load-path path*)
,(setup-quit))))
:documentation "Add PATH to load path.
This macro can be used as NAME, and it will replace itself with
the nondirectory part of PATH.
If PATH does not exist, abort the evaluation."
:shorthand (lambda (args)
(intern
(file-name-nondirectory
(directory-file-name (cadr args))))))
;;; Straight.el
(with-eval-after-load 'straight
(setup-define :also-straight
(lambda (recipe) `(setup (:straight ,recipe)))
:documentation
"Install RECIPE with `straight-use-package', after loading FEATURE."
:repeatable t
:after-loaded t)
(defun +setup-straight-shorthand (sexp)
"Shorthand for `:straight' and other local macros."
(let ((recipe (cadr sexp)))
(or (car-safe recipe) recipe)))
(setup-define :straight
(lambda (recipe)
`(unless (ignore-errors (straight-use-package ',recipe) t)
(+setup-warn ":straight error: %S" ',recipe)
,(setup-quit)))
: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 #'+setup-straight-shorthand)
(setup-define :straight-after
(lambda (recipe feature)
`(with-eval-after-load ,feature
(setup (:straight ,recipe))))
:indent 1
:documentation
"Install RECIPE with `straight-use-package', after FEATURE.
This macro can be used as HEAD, and will replace itself with the
first RECIPE's package."
:shorthand #'+setup-straight-shorthand)
(setup-define :straight-when
(lambda (recipe condition)
`(if ,condition
(unless (ignore-errors (straight-use-package ',recipe) t)
(+setup-warn ":straight error: %S" ',recipe)
,(setup-quit))
(message "Setup: :straight-when returned nil %S" ',recipe)
,(setup-quit)))
:documentation
"Install RECIPE with `straight-use-package' when CONDITION is met.
If CONDITION is false, or if `straight-use-package' fails, stop
evaluating the body. This macro can be used as HEAD, and will
replace itself with the RECIPE's package."
:repeatable 2
:indent 1
:shorthand #'+setup-straight-shorthand))
;;; Redefines of `setup' forms
(setup-define :bind-into
(lambda (feature-or-map &rest rest)
(cl-loop for f/m in (ensure-list feature-or-map)
collect (if (string-match-p "-map\\'" (symbol-name f/m))
`(:with-map ,f/m (:bind ,@rest))
`(:with-feature ,f/m (:bind ,@rest)))
into forms
finally return `(progn ,@forms)))
:documentation "Bind into keys into the map(s) of FEATURE-OR-MAP.
FEATURE-OR-MAP can be a feature or map name or a list of them.
The arguments REST are handled as by `:bind'."
:debug '(sexp &rest form sexp)
:indent 1)
(provide '+setup)
;;; +setup.el ends here
|
