about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2022-01-04 14:41:46 -0600
committerCase Duckworth2022-01-04 14:41:46 -0600
commit13a3ba026fb29fb9faccca625c41d90769c56db4 (patch)
tree8b8c332ecd770917ed40407599e6b858ffdb2fea
parentAdd titlecase-dwim to +casing-map (diff)
downloademacs-13a3ba026fb29fb9faccca625c41d90769c56db4.tar.gz
emacs-13a3ba026fb29fb9faccca625c41d90769c56db4.zip
A few various changes: typos and bugs
-rw-r--r--init.el62
-rw-r--r--lisp/+modeline.el4
2 files changed, 36 insertions, 30 deletions
diff --git a/init.el b/init.el index 110b7d2..002a2b1 100644 --- a/init.el +++ b/init.el
@@ -104,22 +104,19 @@
104 browse-url-firefox-arguments '("--new-tab") 104 browse-url-firefox-arguments '("--new-tab")
105 browse-url-firefox-new-window-is-tab t) 105 browse-url-firefox-new-window-is-tab t)
106 ;; Set up external browsing URLs. 106 ;; Set up external browsing URLs.
107 (with-eval-after-load custom-file 107 (add-to-list '+custom-variable-allowlist
108 ;; I want to make sure and load these /after/ the custom-file's been loaded 108 '+browse-url-secondary-browser-regexps)
109 ;; so that it doesn't overwrite the following list. 109 (dolist (domain '("github.com" "twitch.tv"
110 (add-to-list '+custom-variable-allowlist 110 "gitlab.com"
111 '+browse-url-secondary-browser-regexps) 111 "google.com"
112 (dolist (domain '("github.com" "twitch.tv" 112 "imgur.com"
113 "gitlab.com" 113 "pixelfed" "instagram.com" "bibliogram.art"
114 "google.com" 114 "reddit.com" "teddit.net"
115 "imgur.com" 115 "tildes.net"
116 "pixelfed" "instagram.com" "bibliogram.art" 116 "taskiq"
117 "reddit.com" "teddit.net" 117 "twitter.com" "nitter.net"
118 "tildes.net" 118 "streamable.com"))
119 "taskiq" 119 (add-to-list '+browse-url-secondary-browser-regexps domain))
120 "twitter.com" "nitter.net"
121 "streamable.com"))
122 (add-to-list '+browse-url-secondary-browser-regexps domain)))
123 ;; Set up URL handlers. 120 ;; Set up URL handlers.
124 (+browse-url-set-handlers 121 (+browse-url-set-handlers
125 (list 122 (list
@@ -179,9 +176,10 @@
179 custom-magic-show-button t 176 custom-magic-show-button t
180 custom-raised-buttons nil 177 custom-raised-buttons nil
181 custom-unlispify-tag-names nil 178 custom-unlispify-tag-names nil
182 custom-variable-default-form 'lisp 179 custom-variable-default-form 'lisp)
183 +custom-variable-allowlist '(safe-local-variable-values 180 (dolist (var '(safe-local-variable-values
184 warning-suppress-types)) 181 warning-suppress-types))
182 (add-to-list '+custom-variable-allowlist var))
185 (+ensure-after-init #'+custom-load-ignoring-most-customizations) 183 (+ensure-after-init #'+custom-load-ignoring-most-customizations)
186 (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets) 184 (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets)
187 (:with-mode Custom-mode 185 (:with-mode Custom-mode
@@ -380,7 +378,7 @@
380 load-path)) 378 load-path))
381 (:also-load +org 379 (:also-load +org
382 ox-md 380 ox-md
383 _work) 381 _work)
384 (:option org-adapt-indentation nil 382 (:option org-adapt-indentation nil
385 org-archive-mark-done t 383 org-archive-mark-done t
386 org-catch-invisible-edits 'show-and-error 384 org-catch-invisible-edits 'show-and-error
@@ -439,7 +437,16 @@
439 (advice-add #'org-delete-backward-char :override #'+org-delete-backward-char) 437 (advice-add #'org-delete-backward-char :override #'+org-delete-backward-char)
440 (with-eval-after-load 'org 438 (with-eval-after-load 'org
441 (org-clock-persistence-insinuate) 439 (org-clock-persistence-insinuate)
442 (org-link-set-parameters "tel" :follow #'+org-tel-open))) 440 (org-link-set-parameters "tel" :follow #'+org-tel-open))
441 ;; Fancy list bullets
442 (font-lock-add-keywords
443 'org-mode
444 '(("^ *\\([-]\\) "
445 (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•"))))
446 ("^ *\\([+]\\) "
447 (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "◦"))))
448 ("^ +\\([*]\\) " ; * at the beginning of the line is a header
449 (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "‣")))))))
443 450
444(setup org-agenda 451(setup org-agenda
445 (:option org-agenda-skip-deadline-if-done t 452 (:option org-agenda-skip-deadline-if-done t
@@ -452,12 +459,11 @@
452 org-deadline-warning-days 0 459 org-deadline-warning-days 0
453 org-agenda-show-future-repeats 'next 460 org-agenda-show-future-repeats 'next
454 org-agenda-window-setup 'current-window) 461 org-agenda-window-setup 'current-window)
455 (with-eval-after-load custom-file 462 (dolist (var '(org-agenda-files
456 (dolist (var '(org-agenda-files 463 org-agenda-file-regexp
457 org-agenda-file-regexp 464 org-agenda-templates))
458 org-agenda-templates)) 465 (add-to-list '+custom-variable-allowlist var))
459 (add-to-list '+custom-variable-allowlist var)) 466 (add-to-list 'org-agenda-files (sync/ "org/" t))
460 (add-to-list 'org-agenda-files (sync/ "org/" t)))
461 (:+leader "a" #'org-agenda "C-a" #'org-agenda) 467 (:+leader "a" #'org-agenda "C-a" #'org-agenda)
462 (:hook #'hl-line-mode)) 468 (:hook #'hl-line-mode))
463 469
@@ -865,7 +871,7 @@ See also `crux-reopen-as-root-mode'."
865 (run-at-time 0 nil #'elfeed-show-refresh)))) 871 (run-at-time 0 nil #'elfeed-show-refresh))))
866 872
867(setup (:straight elfeed-org) 873(setup (:straight elfeed-org)
868 (:option rmh-elfeed-org-files (list (elfeed/ "/elfeed.org" t))) 874 (:option rmh-elfeed-org-files (list (elfeed/ "elfeed.org" t)))
869 (elfeed-org)) 875 (elfeed-org))
870 876
871(setup (:straight elpher)) 877(setup (:straight elpher))
diff --git a/lisp/+modeline.el b/lisp/+modeline.el index 5f46a75..db3deb4 100644 --- a/lisp/+modeline.el +++ b/lisp/+modeline.el
@@ -88,10 +88,10 @@ This function makes a lambda, so you can throw it straight into
88(defun +modeline-major-mode (&optional spacer) 88(defun +modeline-major-mode (&optional spacer)
89 "Display the current `major-mode'." 89 "Display the current `major-mode'."
90 (concat (or spacer +modeline-default-spacer) 90 (concat (or spacer +modeline-default-spacer)
91 (propertize (+string-truncate (format-mode-line mode-name) 91 (propertize (+string-truncate (format-mode-line mode-name) 12)
92 12 "~")
93 'face 'bold 92 'face 'bold
94 'keymap mode-line-major-mode-keymap 93 'keymap mode-line-major-mode-keymap
94 'help-echo (concat mode-name " mode\nmouse-1: show menu.")
95 'mouse-face 'mode-line-highlight))) 95 'mouse-face 'mode-line-highlight)))
96 96
97(defcustom +modeline-modified-icon-alist '((ephemeral . "*") 97(defcustom +modeline-modified-icon-alist '((ephemeral . "*")