diff options
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/acdw-defaults.el | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/lisp/acdw-defaults.el b/lisp/acdw-defaults.el index 80b2bcc..e4c9e14 100644 --- a/lisp/acdw-defaults.el +++ b/lisp/acdw-defaults.el | |||
@@ -104,43 +104,46 @@ | |||
104 | )) | 104 | )) |
105 | (funcall disable-mode -1)) | 105 | (funcall disable-mode -1)) |
106 | 106 | ||
107 | (deftheme use-package) | ||
108 | (enable-theme 'use-package) | ||
109 | |||
107 | ;;; Internal packages | 110 | ;;; Internal packages |
108 | 111 | ||
109 | (when (require 'abbrev nil t) | 112 | (when (require 'abbrev nil t) |
110 | (custom-set-variables | 113 | (custom-theme-set-variables 'use-package |
111 | '(abbrev-file-name (sync/ "abbrev.el")) | 114 | '(abbrev-file-name (sync/ "abbrev.el")) |
112 | '(save-abbrevs 'silently))) | 115 | '(save-abbrevs 'silently))) |
113 | 116 | ||
114 | (when (require 'autorevert nil t) | 117 | (when (require 'autorevert nil t) |
115 | (custom-set-variables | 118 | (custom-theme-set-variables 'use-package |
116 | '(auto-revert-verbose nil) | 119 | '(auto-revert-verbose nil) |
117 | '(global-auto-revert-non-file-buffers t)) | 120 | '(global-auto-revert-non-file-buffers t)) |
118 | (global-auto-revert-mode +1)) | 121 | (global-auto-revert-mode +1)) |
119 | 122 | ||
120 | (when (require 'comp nil t) | 123 | (when (require 'comp nil t) |
121 | (custom-set-variables | 124 | (custom-theme-set-variables 'use-package |
122 | '(native-comp-async-report-warnings-errors 'silent) | 125 | '(native-comp-async-report-warnings-errors 'silent) |
123 | '(native-comp-deferred-compilation t))) | 126 | '(native-comp-deferred-compilation t))) |
124 | 127 | ||
125 | (when (require 'custom nil t) | 128 | (when (require 'custom nil t) |
126 | (custom-set-variables | 129 | (custom-theme-set-variables 'use-package |
127 | '(custom-file (etc/ "custom.el")))) | 130 | '(custom-file (etc/ "custom.el")))) |
128 | 131 | ||
129 | (when (require 'ediff nil t) | 132 | (when (require 'ediff nil t) |
130 | (custom-set-variables | 133 | (custom-theme-set-variables 'use-package |
131 | '(ediff-window-setup-function #'ediff-setup-windows-plain))) | 134 | '(ediff-window-setup-function #'ediff-setup-windows-plain))) |
132 | 135 | ||
133 | (when (require 'eldoc nil t) | 136 | (when (require 'eldoc nil t) |
134 | (custom-set-variables | 137 | (custom-theme-set-variables 'use-package |
135 | '(eldoc-echo-area-use-multiline-p nil) | 138 | '(eldoc-echo-area-use-multiline-p nil) |
136 | '(eldoc-idle-delay 0.1))) | 139 | '(eldoc-idle-delay 0.1))) |
137 | 140 | ||
138 | (when (require 'executable nil t) | 141 | (when (require 'executable nil t) |
139 | (custom-set-variables | 142 | (custom-theme-set-variables 'use-package |
140 | '(executable-prefix-env t))) | 143 | '(executable-prefix-env t))) |
141 | 144 | ||
142 | (when (require 'files nil t) | 145 | (when (require 'files nil t) |
143 | (custom-set-variables | 146 | (custom-theme-set-variables 'use-package |
144 | '(auto-save-default nil) | 147 | '(auto-save-default nil) |
145 | '(auto-save-interval 1) | 148 | '(auto-save-interval 1) |
146 | '(auto-save-no-message t) | 149 | '(auto-save-no-message t) |
@@ -163,7 +166,7 @@ | |||
163 | (auto-save-visited-mode)) | 166 | (auto-save-visited-mode)) |
164 | 167 | ||
165 | (when (require 'frame nil t) | 168 | (when (require 'frame nil t) |
166 | (custom-set-variables | 169 | (custom-theme-set-variables 'use-package |
167 | '(blink-cursor-blinks 1) | 170 | '(blink-cursor-blinks 1) |
168 | '(blink-cursor-interval 0.25) | 171 | '(blink-cursor-interval 0.25) |
169 | '(blink-cursor-delay 0.25)) | 172 | '(blink-cursor-delay 0.25)) |
@@ -179,21 +182,21 @@ | |||
179 | (add-hook 'ibuffer-mode-hook #'hl-line-mode)) | 182 | (add-hook 'ibuffer-mode-hook #'hl-line-mode)) |
180 | 183 | ||
181 | (when (require 'image nil t) | 184 | (when (require 'image nil t) |
182 | (custom-set-variables | 185 | (custom-theme-set-variables 'use-package |
183 | '(image-use-external-converter | 186 | '(image-use-external-converter |
184 | (seq-some #'executable-find '("convert" "gm" "ffmpeg"))))) | 187 | (seq-some #'executable-find '("convert" "gm" "ffmpeg"))))) |
185 | 188 | ||
186 | (when (require 'imenu nil t) | 189 | (when (require 'imenu nil t) |
187 | (custom-set-variables | 190 | (custom-theme-set-variables 'use-package |
188 | '(imenu-auto-rescan t))) | 191 | '(imenu-auto-rescan t))) |
189 | 192 | ||
190 | (when (require 'isearch nil t) | 193 | (when (require 'isearch nil t) |
191 | (custom-set-variables | 194 | (custom-theme-set-variables 'use-package |
192 | '(regexp-search-ring-max default-ring-max) | 195 | '(regexp-search-ring-max default-ring-max) |
193 | '(search-ring-max default-ring-max))) | 196 | '(search-ring-max default-ring-max))) |
194 | 197 | ||
195 | (when (require 'minibuffer nil t) | 198 | (when (require 'minibuffer nil t) |
196 | (custom-set-variables | 199 | (custom-theme-set-variables 'use-package |
197 | '(completion-category-defaults nil) | 200 | '(completion-category-defaults nil) |
198 | '(completion-category-overrides '((file (styles partial-completion)))) | 201 | '(completion-category-overrides '((file (styles partial-completion)))) |
199 | '(completion-ignore-case t) | 202 | '(completion-ignore-case t) |
@@ -209,13 +212,13 @@ | |||
209 | (minibuffer-electric-default-mode)) | 212 | (minibuffer-electric-default-mode)) |
210 | 213 | ||
211 | (when (require 'mouse nil t) | 214 | (when (require 'mouse nil t) |
212 | (custom-set-variables | 215 | (custom-theme-set-variables 'use-package |
213 | '(mouse-drag-copy-region t) | 216 | '(mouse-drag-copy-region t) |
214 | '(mouse-wheel-progressive-speed nil) | 217 | '(mouse-wheel-progressive-speed nil) |
215 | '(mouse-yank-at-point t))) | 218 | '(mouse-yank-at-point t))) |
216 | 219 | ||
217 | (when (require 'paren nil t) | 220 | (when (require 'paren nil t) |
218 | (custom-set-variables | 221 | (custom-theme-set-variables 'use-package |
219 | '(show-paren-delay 0.01) | 222 | '(show-paren-delay 0.01) |
220 | '(show-paren-style 'parenthesis) | 223 | '(show-paren-style 'parenthesis) |
221 | '(show-paren-when-point-in-periphery t) | 224 | '(show-paren-when-point-in-periphery t) |
@@ -224,7 +227,7 @@ | |||
224 | (electric-pair-mode)) | 227 | (electric-pair-mode)) |
225 | 228 | ||
226 | (when (require 'recentf nil t) | 229 | (when (require 'recentf nil t) |
227 | (custom-set-variables | 230 | (custom-theme-set-variables 'use-package |
228 | '(recentf-save-file (var/ "recentf.el")) | 231 | '(recentf-save-file (var/ "recentf.el")) |
229 | '(recentf-max-menu-items default-ring-max) | 232 | '(recentf-max-menu-items default-ring-max) |
230 | '(recentf-max-saved-items nil) | 233 | '(recentf-max-saved-items nil) |
@@ -236,7 +239,7 @@ | |||
236 | (recentf-mode +1)) | 239 | (recentf-mode +1)) |
237 | 240 | ||
238 | (when (require 'savehist nil t) | 241 | (when (require 'savehist nil t) |
239 | (custom-set-variables | 242 | (custom-theme-set-variables 'use-package |
240 | '(history-length 1024) | 243 | '(history-length 1024) |
241 | '(history-delete-duplicates t) | 244 | '(history-delete-duplicates t) |
242 | '(savehist-file (var/ "savehist.el")) | 245 | '(savehist-file (var/ "savehist.el")) |
@@ -262,25 +265,25 @@ | |||
262 | (savehist-mode +1)) | 265 | (savehist-mode +1)) |
263 | 266 | ||
264 | (when (require 'saveplace nil t) | 267 | (when (require 'saveplace nil t) |
265 | (custom-set-variables | 268 | (custom-theme-set-variables 'use-package |
266 | '(save-place-file (var/ "places.el")) | 269 | '(save-place-file (var/ "places.el")) |
267 | '(save-place-forget-unreadable-files (eq system-type 'gnu/linux))) | 270 | '(save-place-forget-unreadable-files (eq system-type 'gnu/linux))) |
268 | (save-place-mode 1)) | 271 | (save-place-mode 1)) |
269 | 272 | ||
270 | (when (require 'uniquify nil t) | 273 | (when (require 'uniquify nil t) |
271 | (custom-set-variables | 274 | (custom-theme-set-variables 'use-package |
272 | '(uniquify-after-kill-buffer-p t) | 275 | '(uniquify-after-kill-buffer-p t) |
273 | '(uniquify-buffer-name-style 'forward) | 276 | '(uniquify-buffer-name-style 'forward) |
274 | '(uniquify-ignore-buffers-re "^\\*") | 277 | '(uniquify-ignore-buffers-re "^\\*") |
275 | '(uniquify-separator path-separator))) | 278 | '(uniquify-separator path-separator))) |
276 | 279 | ||
277 | (when (require 'vc nil t) | 280 | (when (require 'vc nil t) |
278 | (custom-set-variables | 281 | (custom-theme-set-variables 'use-package |
279 | '(vc-follow-symlinks t) | 282 | '(vc-follow-symlinks t) |
280 | '(vc-make-backup-files t))) | 283 | '(vc-make-backup-files t))) |
281 | 284 | ||
282 | (when (require 'window nil t) | 285 | (when (require 'window nil t) |
283 | (custom-set-variables | 286 | (custom-theme-set-variables 'use-package |
284 | '(recenter-positions '(top 2 middle bottom)))) | 287 | '(recenter-positions '(top 2 middle bottom)))) |
285 | 288 | ||
286 | ;;; New features | 289 | ;;; New features |