From 13a3ba026fb29fb9faccca625c41d90769c56db4 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Tue, 4 Jan 2022 14:41:46 -0600 Subject: A few various changes: typos and bugs --- init.el | 62 ++++++++++++++++++++++++++++++------------------------- lisp/+modeline.el | 4 ++-- 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 @@ browse-url-firefox-arguments '("--new-tab") browse-url-firefox-new-window-is-tab t) ;; Set up external browsing URLs. - (with-eval-after-load custom-file - ;; I want to make sure and load these /after/ the custom-file's been loaded - ;; so that it doesn't overwrite the following list. - (add-to-list '+custom-variable-allowlist - '+browse-url-secondary-browser-regexps) - (dolist (domain '("github.com" "twitch.tv" - "gitlab.com" - "google.com" - "imgur.com" - "pixelfed" "instagram.com" "bibliogram.art" - "reddit.com" "teddit.net" - "tildes.net" - "taskiq" - "twitter.com" "nitter.net" - "streamable.com")) - (add-to-list '+browse-url-secondary-browser-regexps domain))) + (add-to-list '+custom-variable-allowlist + '+browse-url-secondary-browser-regexps) + (dolist (domain '("github.com" "twitch.tv" + "gitlab.com" + "google.com" + "imgur.com" + "pixelfed" "instagram.com" "bibliogram.art" + "reddit.com" "teddit.net" + "tildes.net" + "taskiq" + "twitter.com" "nitter.net" + "streamable.com")) + (add-to-list '+browse-url-secondary-browser-regexps domain)) ;; Set up URL handlers. (+browse-url-set-handlers (list @@ -179,9 +176,10 @@ custom-magic-show-button t custom-raised-buttons nil custom-unlispify-tag-names nil - custom-variable-default-form 'lisp - +custom-variable-allowlist '(safe-local-variable-values - warning-suppress-types)) + custom-variable-default-form 'lisp) + (dolist (var '(safe-local-variable-values + warning-suppress-types)) + (add-to-list '+custom-variable-allowlist var)) (+ensure-after-init #'+custom-load-ignoring-most-customizations) (advice-add #'custom-buffer-create-internal :after #'+cus-edit-expand-widgets) (:with-mode Custom-mode @@ -380,7 +378,7 @@ load-path)) (:also-load +org ox-md - _work) + _work) (:option org-adapt-indentation nil org-archive-mark-done t org-catch-invisible-edits 'show-and-error @@ -439,7 +437,16 @@ (advice-add #'org-delete-backward-char :override #'+org-delete-backward-char) (with-eval-after-load 'org (org-clock-persistence-insinuate) - (org-link-set-parameters "tel" :follow #'+org-tel-open))) + (org-link-set-parameters "tel" :follow #'+org-tel-open)) + ;; Fancy list bullets + (font-lock-add-keywords + 'org-mode + '(("^ *\\([-]\\) " + (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "•")))) + ("^ *\\([+]\\) " + (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "◦")))) + ("^ +\\([*]\\) " ; * at the beginning of the line is a header + (0 (prog1 () (compose-region (match-beginning 1) (match-end 1) "‣"))))))) (setup org-agenda (:option org-agenda-skip-deadline-if-done t @@ -452,12 +459,11 @@ org-deadline-warning-days 0 org-agenda-show-future-repeats 'next org-agenda-window-setup 'current-window) - (with-eval-after-load custom-file - (dolist (var '(org-agenda-files - org-agenda-file-regexp - org-agenda-templates)) - (add-to-list '+custom-variable-allowlist var)) - (add-to-list 'org-agenda-files (sync/ "org/" t))) + (dolist (var '(org-agenda-files + org-agenda-file-regexp + org-agenda-templates)) + (add-to-list '+custom-variable-allowlist var)) + (add-to-list 'org-agenda-files (sync/ "org/" t)) (:+leader "a" #'org-agenda "C-a" #'org-agenda) (:hook #'hl-line-mode)) @@ -865,7 +871,7 @@ See also `crux-reopen-as-root-mode'." (run-at-time 0 nil #'elfeed-show-refresh)))) (setup (:straight elfeed-org) - (:option rmh-elfeed-org-files (list (elfeed/ "/elfeed.org" t))) + (:option rmh-elfeed-org-files (list (elfeed/ "elfeed.org" t))) (elfeed-org)) (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 (defun +modeline-major-mode (&optional spacer) "Display the current `major-mode'." (concat (or spacer +modeline-default-spacer) - (propertize (+string-truncate (format-mode-line mode-name) - 12 "~") + (propertize (+string-truncate (format-mode-line mode-name) 12) 'face 'bold 'keymap mode-line-major-mode-keymap + 'help-echo (concat mode-name " mode\nmouse-1: show menu.") 'mouse-face 'mode-line-highlight))) (defcustom +modeline-modified-icon-alist '((ephemeral . "*") -- cgit 1.4.1-21-gabe81