diff options
author | Case Duckworth | 2020-12-23 20:28:54 -0600 |
---|---|---|
committer | Case Duckworth | 2020-12-23 20:29:59 -0600 |
commit | 814ae62c7c58dd3400254e73aa1266f52a895a7a (patch) | |
tree | 038800fe18ae4a6864c606dfd6f7be97c2055860 | |
parent | Remove redundancy (diff) | |
download | emacs-814ae62c7c58dd3400254e73aa1266f52a895a7a.tar.gz emacs-814ae62c7c58dd3400254e73aa1266f52a895a7a.zip |
Add (declare) form to cuss
-rw-r--r-- | config.org | 83 |
1 files changed, 49 insertions, 34 deletions
diff --git a/config.org b/config.org index a32bba6..5cb5ee2 100644 --- a/config.org +++ b/config.org | |||
@@ -107,6 +107,8 @@ when it errors. | |||
107 | #+begin_src emacs-lisp | 107 | #+begin_src emacs-lisp |
108 | (defmacro cuss (var val &optional docstring) | 108 | (defmacro cuss (var val &optional docstring) |
109 | "Basically `:custom' from `use-package', broken out." | 109 | "Basically `:custom' from `use-package', broken out." |
110 | (declare (indent 2) | ||
111 | (doc-string 3)) | ||
110 | `(funcall (or (get ',var 'custom-set) #'set-default) | 112 | `(funcall (or (get ',var 'custom-set) #'set-default) |
111 | ',var ,val)) | 113 | ',var ,val)) |
112 | #+end_src | 114 | #+end_src |
@@ -116,22 +118,25 @@ when it errors. | |||
116 | #+begin_src emacs-lisp | 118 | #+begin_src emacs-lisp |
117 | (straight-use-package 'no-littering) | 119 | (straight-use-package 'no-littering) |
118 | 120 | ||
119 | (cuss backup-directory-alist `((".*" . ,(no-littering-expand-var-file-name "backup/"))) | 121 | (cuss backup-directory-alist |
120 | "Where to store backup files.") | 122 | `((".*" . ,(no-littering-expand-var-file-name "backup/"))) |
123 | "Where to store backup files.") | ||
121 | 124 | ||
122 | (cuss auto-save-file-name-transforms | 125 | (cuss auto-save-file-name-transforms |
123 | `((".*" ,(no-littering-expand-var-file-name "autosaves/") t)) | 126 | `((".*" ,(no-littering-expand-var-file-name "autosaves/") t)) |
124 | "Where to store auto-save files.") | 127 | "Where to store auto-save files.") |
125 | 128 | ||
126 | (cuss save-place-file (no-littering-expand-var-file-name "places") | 129 | (cuss save-place-file |
127 | "Where to store place files.") | 130 | (no-littering-expand-var-file-name "places") |
131 | "Where to store place files.") | ||
128 | 132 | ||
129 | (cuss undo-fu-session-directory (no-littering-expand-var-file-name "undos/") | 133 | (cuss undo-fu-session-directory |
130 | "Where to store undo information.") | 134 | (no-littering-expand-var-file-name "undos/") |
135 | "Where to store undo information.") | ||
131 | 136 | ||
132 | (cuss elpher-certificate-directory | 137 | (cuss elpher-certificate-directory |
133 | (no-littering-expand-var-file-name "elpher-certificates/") | 138 | (no-littering-expand-var-file-name "elpher-certificates/") |
134 | "Where to store elpher client certificates.") | 139 | "Where to store elpher client certificates.") |
135 | 140 | ||
136 | ;; Make all directories defined above | 141 | ;; Make all directories defined above |
137 | (dolist (dir '("backup" | 142 | (dolist (dir '("backup" |
@@ -156,8 +161,9 @@ when it errors. | |||
156 | 161 | ||
157 | #+begin_src emacs-lisp | 162 | #+begin_src emacs-lisp |
158 | (cuss default-frame-alist | 163 | (cuss default-frame-alist |
159 | '((tool-bar-lines . 0) | 164 | '((tool-bar-lines . 0) |
160 | (menu-bar-lines . 0))) | 165 | (menu-bar-lines . 0)) |
166 | "On a default frame, show no tool bars or menu bars.") | ||
161 | 167 | ||
162 | (menu-bar-mode -1) | 168 | (menu-bar-mode -1) |
163 | (tool-bar-mode -1) | 169 | (tool-bar-mode -1) |
@@ -176,7 +182,8 @@ when it errors. | |||
176 | *** Dialog boxen | 182 | *** Dialog boxen |
177 | 183 | ||
178 | #+begin_src emacs-lisp | 184 | #+begin_src emacs-lisp |
179 | (cuss use-dialog-box nil) | 185 | (cuss use-dialog-box nil |
186 | "Don't show dialog boxes.") | ||
180 | #+end_src | 187 | #+end_src |
181 | 188 | ||
182 | *** Shorten confirmations | 189 | *** Shorten confirmations |
@@ -188,7 +195,9 @@ when it errors. | |||
188 | *** Remove the bell | 195 | *** Remove the bell |
189 | 196 | ||
190 | #+begin_src emacs-lisp | 197 | #+begin_src emacs-lisp |
191 | (cuss visible-bell (not (string= (system-name) "larry"))) | 198 | ;(cuss visible-bell |
199 | ; (not (string= (system-name) "larry")) | ||
200 | ; "Only show a visible bell when on 'larry'.") | ||
192 | 201 | ||
193 | (defun acdw/ring-bell-function () | 202 | (defun acdw/ring-bell-function () |
194 | "Custom bell-ringing function." | 203 | "Custom bell-ringing function." |
@@ -225,9 +234,10 @@ when it errors. | |||
225 | 234 | ||
226 | #+begin_src emacs-lisp | 235 | #+begin_src emacs-lisp |
227 | (cuss minibuffer-frame-alist | 236 | (cuss minibuffer-frame-alist |
228 | '((width . 80) | 237 | '((width . 80) |
229 | (height . 2) | 238 | (height . 2) |
230 | (vertical-scrollbars . nil))) | 239 | (vertical-scrollbars . nil)) |
240 | "Set up the minibuffer frame.") | ||
231 | 241 | ||
232 | (set-window-scroll-bars (minibuffer-window) nil nil) | 242 | (set-window-scroll-bars (minibuffer-window) nil nil) |
233 | #+end_src | 243 | #+end_src |
@@ -236,7 +246,8 @@ when it errors. | |||
236 | 246 | ||
237 | #+begin_src emacs-lisp | 247 | #+begin_src emacs-lisp |
238 | (cuss minibuffer-prompt-properties | 248 | (cuss minibuffer-prompt-properties |
239 | '(read-only t cursor-intangible t face minibuffer-prompt)) | 249 | '(read-only t cursor-intangible t face minibuffer-prompt) |
250 | "Disable moving the cursor into the minibuffer prompt.") | ||
240 | #+end_src | 251 | #+end_src |
241 | 252 | ||
242 | *** Tabs | 253 | *** Tabs |
@@ -244,23 +255,25 @@ when it errors. | |||
244 | **** Show the tabs as current buffer, plus window count | 255 | **** Show the tabs as current buffer, plus window count |
245 | 256 | ||
246 | #+begin_src emacs-lisp | 257 | #+begin_src emacs-lisp |
247 | (cuss tab-bar-tab-name-function #'tab-bar-tab-name-current-with-count) | 258 | (cuss tab-bar-tab-name-function |
259 | #'tab-bar-tab-name-current-with-count) | ||
248 | #+end_src | 260 | #+end_src |
249 | 261 | ||
250 | **** Only show the tab bar when there's more than one tab | 262 | **** Only show the tab bar when there's more than one tab |
251 | 263 | ||
252 | #+begin_src emacs-lisp | 264 | #+begin_src emacs-lisp |
253 | (cuss tab-bar-show 1 | 265 | (cuss tab-bar-show 1 |
254 | "Show the tab bar only when there's more than 1 tab.") | 266 | "Show the tab bar only when there's more than 1 tab.") |
255 | #+end_src | 267 | #+end_src |
256 | 268 | ||
257 | *** Cursor | 269 | *** Cursor |
258 | 270 | ||
259 | #+begin_src emacs-lisp | 271 | #+begin_src emacs-lisp |
260 | (cuss cursor-type 'bar | 272 | (cuss cursor-type 'bar |
261 | "Show a vertical bar for the cursor.") | 273 | "Show a vertical bar for the cursor.") |
262 | (cuss cursor-in-non-selected-windows 'hollow | 274 | (cuss cursor-in-non-selected-windows 'hollow |
263 | "In inactive windows, make the cursor an empty box.") | 275 | "In inactive windows, make the cursor an empty box.") |
276 | |||
264 | (blink-cursor-mode 0) | 277 | (blink-cursor-mode 0) |
265 | #+end_src | 278 | #+end_src |
266 | 279 | ||
@@ -275,11 +288,13 @@ when it errors. | |||
275 | 288 | ||
276 | #+begin_src emacs-lisp | 289 | #+begin_src emacs-lisp |
277 | (cuss indicate-buffer-boundaries | 290 | (cuss indicate-buffer-boundaries |
278 | '((up . right) | 291 | '((up . right) |
279 | (down . right) | 292 | (down . right) |
280 | (t . nil))) | 293 | (t . nil)) |
294 | "Show arrows on the right when there's more to the buffer up or down.") | ||
281 | 295 | ||
282 | (cuss indicate-empty-lines t) | 296 | (cuss indicate-empty-lines t |
297 | "Show a bitmap on the left for empty lines after the end of a buffer.") | ||
283 | #+end_src | 298 | #+end_src |
284 | 299 | ||
285 | ** Windows | 300 | ** Windows |
@@ -295,9 +310,9 @@ when it errors. | |||
295 | 310 | ||
296 | #+begin_src emacs-lisp | 311 | #+begin_src emacs-lisp |
297 | (cuss windmove-create-window t | 312 | (cuss windmove-create-window t |
298 | "Create windows in a direction if they don't exist.") | 313 | "Create windows in a direction if they don't exist.") |
299 | (cuss windomove-wrap-around t | 314 | (cuss windomove-wrap-around t |
300 | "Wrap window movements around frame edges.") | 315 | "Wrap window movements around frame edges.") |
301 | 316 | ||
302 | (windmove-default-keybindings) | 317 | (windmove-default-keybindings) |
303 | #+end_src | 318 | #+end_src |
@@ -366,8 +381,8 @@ from [[https://github.com/link0ff/emacs-init][link0ff]]. | |||
366 | (cuss modus-themes-diffs nil) | 381 | (cuss modus-themes-diffs nil) |
367 | (cuss modus-themes-org-blocks 'grayscale) | 382 | (cuss modus-themes-org-blocks 'grayscale) |
368 | (cuss modus-themes-headings | 383 | (cuss modus-themes-headings |
369 | '((1 . line) | 384 | '((1 . line) |
370 | (t . t))) | 385 | (t . t))) |
371 | (cuss modus-themes-variable-pitch-headings t) | 386 | (cuss modus-themes-variable-pitch-headings t) |
372 | (cuss modus-themes-scale-headings t) | 387 | (cuss modus-themes-scale-headings t) |
373 | (cuss modus-themes-scale-1 1.1) | 388 | (cuss modus-themes-scale-1 1.1) |
@@ -678,9 +693,9 @@ Also from link0ff. See the above for a link. | |||
678 | (require 'savehist) | 693 | (require 'savehist) |
679 | 694 | ||
680 | (cuss savehist-additional-variables | 695 | (cuss savehist-additional-variables |
681 | '(kill-ring | 696 | '(kill-ring |
682 | search-ring | 697 | search-ring |
683 | regexp-search-ring)) | 698 | regexp-search-ring)) |
684 | 699 | ||
685 | (cuss savehist-save-minibuffer-history t) | 700 | (cuss savehist-save-minibuffer-history t) |
686 | 701 | ||
@@ -697,7 +712,7 @@ Also from link0ff. See the above for a link. | |||
697 | (require 'saveplace) | 712 | (require 'saveplace) |
698 | 713 | ||
699 | (cuss save-place-forget-unreadable-files | 714 | (cuss save-place-forget-unreadable-files |
700 | (not (eq system-type 'windows-nt))) | 715 | (not (eq system-type 'windows-nt))) |
701 | 716 | ||
702 | (save-place-mode 1) | 717 | (save-place-mode 1) |
703 | #+end_src | 718 | #+end_src |