diff options
author | Case Duckworth | 2021-03-16 09:30:40 -0500 |
---|---|---|
committer | Case Duckworth | 2021-03-16 09:30:40 -0500 |
commit | f17f0a6629c718a2433267ca898fe16d6e0ae868 (patch) | |
tree | f50ccbcab88dd1572977cb053c8e7b4b2870133a /init.el | |
parent | "Package-ize" dired (diff) | |
parent | Install `no-littering' (diff) | |
download | emacs-f17f0a6629c718a2433267ca898fe16d6e0ae868.tar.gz emacs-f17f0a6629c718a2433267ca898fe16d6e0ae868.zip |
Merge branch 'main' of https://tildegit.org/acdw/emacs into 5c
Diffstat (limited to 'init.el')
-rw-r--r-- | init.el | 89 |
1 files changed, 39 insertions, 50 deletions
diff --git a/init.el b/init.el index 47b8462..d0b6f6a 100644 --- a/init.el +++ b/init.el | |||
@@ -258,6 +258,9 @@ | |||
258 | (when (require 'imenu) | 258 | (when (require 'imenu) |
259 | (acdw/set '((imenu-auto-rescan t)))) | 259 | (acdw/set '((imenu-auto-rescan t)))) |
260 | 260 | ||
261 | ;; Fonts | ||
262 | (acdw/set-faces ((fixed-pitch . ((t (:inherit default)))))) | ||
263 | |||
261 | ;;; Packages | 264 | ;;; Packages |
262 | 265 | ||
263 | ;; Undo-fu | 266 | ;; Undo-fu |
@@ -283,68 +286,39 @@ | |||
283 | (modus-themes-scale-headings nil) | 286 | (modus-themes-scale-headings nil) |
284 | (modus-themes-mode-line nil)) | 287 | (modus-themes-mode-line nil)) |
285 | :now ((acdw/sunrise-sunset #'modus-themes-load-operandi | 288 | :now ((acdw/sunrise-sunset #'modus-themes-load-operandi |
286 | #'modus-themes-load-vivendi))) | 289 | #'modus-themes-load-vivendi) |
290 | ;; for june | ||
291 | (global-font-lock-mode -1))) | ||
292 | |||
293 | ;; Expand-region | ||
294 | (acdw/pkg expand-region | ||
295 | :binds (("C-=" er/expand-region))) | ||
296 | |||
297 | ;;; Frame title | ||
298 | |||
299 | (acdw/set `((frame-title-format | ||
300 | "%b %+%* GNU Emacs"))) | ||
287 | 301 | ||
288 | ;;; Mode line | 302 | ;;; Mode line |
289 | 303 | ||
290 | ;; Minions | 304 | ;; Minions |
291 | (acdw/pkg minions | 305 | (acdw/pkg minions) |
292 | :now ((minions-mode +1))) | ||
293 | 306 | ||
294 | ;; Simple mode line | 307 | ;; Simple mode line |
295 | (acdw/pkg simple-modeline | 308 | (acdw/pkg simple-modeline |
296 | :set '((simple-modeline-segments | 309 | :set '((simple-modeline-segments |
297 | ((;; left | 310 | ((;; left |
298 | acdw/modeline-modified | 311 | acdw-modeline/modified |
299 | simple-modeline-segment-buffer-name | 312 | acdw-modeline/buffer-name |
300 | simple-modeline-segment-position) | 313 | simple-modeline-segment-position |
314 | simple-modeline-segment-word-count) | ||
301 | (;; right | 315 | (;; right |
302 | simple-modeline-segment-vc | 316 | acdw-modeline/vc-branch |
303 | simple-modeline-segment-misc-info | 317 | simple-modeline-segment-misc-info |
304 | simple-modeline-segment-process | 318 | simple-modeline-segment-process |
305 | acdw/modeline-minions | 319 | acdw-modeline/minions |
306 | simple-modeline-segment-major-mode)))) | 320 | simple-modeline-segment-major-mode)))) |
307 | :now ((defun acdw/modeline-modified () | 321 | :now ((require 'acdw-modeline) |
308 | "Displays a color-coded buffer modification/read-only | ||
309 | indicator in the mode-line." | ||
310 | (if (not (string-match-p "\\*.*\\*" (buffer-name))) | ||
311 | (let* ((read-only (and buffer-read-only (buffer-file-name))) | ||
312 | (modified (buffer-modified-p))) | ||
313 | (propertize | ||
314 | (if read-only " ×" (if modified " ●" " ○")) | ||
315 | 'face `(:inherit | ||
316 | ,(if modified 'simple-modeline-status-modified | ||
317 | (if read-only 'simple-modeline-status-error | ||
318 | 'simple-modeline-unimportant))) | ||
319 | 'help-echo (format | ||
320 | (concat "Buffer is %s and %smodified\n" | ||
321 | "mouse-1: Toggle read-only status.") | ||
322 | (if read-only "read-only" "writable") | ||
323 | (if modified "" "not ")) | ||
324 | 'local-map (purecopy (simple-modeline-make-mouse-map | ||
325 | 'mouse-1 | ||
326 | (lambda (event) | ||
327 | (interactive "e") | ||
328 | (with-selected-window | ||
329 | (posn-window (event-start event)) | ||
330 | (read-only-mode 'toggle))))) | ||
331 | 'mouse-face 'mode-line-highlight)))) | ||
332 | (defun acdw/modeline-minions () | ||
333 | "Display a button for `minions-minor-modes-menu'." | ||
334 | (concat | ||
335 | " " | ||
336 | (propertize | ||
337 | "ⱷ" | ||
338 | 'help-echo (format | ||
339 | "Minor modes menu\nmouse-1: show menu.") | ||
340 | 'local-map (purecopy (simple-modeline-make-mouse-map | ||
341 | 'mouse-1 | ||
342 | (lambda (event) | ||
343 | (interactive "e") | ||
344 | (with-selected-window (posn-window | ||
345 | (event-start event)) | ||
346 | (minions-minor-modes-menu))))) | ||
347 | 'mouse-face 'mode-line-highlight))) | ||
348 | (simple-modeline-mode +1))) | 322 | (simple-modeline-mode +1))) |
349 | 323 | ||
350 | ;;; Magit | 324 | ;;; Magit |
@@ -416,7 +390,19 @@ indicator in the mode-line." | |||
416 | (org-export-headline-levels 8) | 390 | (org-export-headline-levels 8) |
417 | (org-export-with-smart-quotes t) | 391 | (org-export-with-smart-quotes t) |
418 | (org-export-with-sub-superscripts t)) | 392 | (org-export-with-sub-superscripts t)) |
419 | :hooks ((before-save-hook acdw/hook--org-mode-fix-blank-lines))) | 393 | :hooks ((before-save-hook acdw/hook--org-mode-fix-blank-lines)) |
394 | :binds (("RET" unpackaged/org-return-dwim | ||
395 | :map org-mode-map :map-after 'org))) | ||
396 | |||
397 | ;;; Nov.el -- ebook reader | ||
398 | (acdw/pkg nov | ||
399 | :now ((autoload #'nov-mode "nov") | ||
400 | (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))) | ||
401 | :set `((nov-text-width ,fill-column))) | ||
402 | |||
403 | ;;; 0x0 -- upload files | ||
404 | (acdw/pkg (0x0 :repo "https://git.sr.ht/~zge/nullpointer-emacs") | ||
405 | :set '((0x0-default-host ttm))) | ||
420 | 406 | ||
421 | ;;; Programming languages | 407 | ;;; Programming languages |
422 | 408 | ||
@@ -434,6 +420,9 @@ indicator in the mode-line." | |||
434 | (put 'dotimes-protect 'common-lisp-indent-function | 420 | (put 'dotimes-protect 'common-lisp-indent-function |
435 | (get 'when 'common-lisp-indent-function))) | 421 | (get 'when 'common-lisp-indent-function))) |
436 | 422 | ||
423 | ;; Racket | ||
424 | (acdw/pkg racket-mode) | ||
425 | |||
437 | ;;; Miscellaneous | 426 | ;;; Miscellaneous |
438 | 427 | ||
439 | (acdw/set '((disabled-command-function nil) | 428 | (acdw/set '((disabled-command-function nil) |