From 88ce9336138822d41b9b03a642bb92be4f54d987 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 10 Jul 2024 21:17:26 -0500 Subject: Updates! --- emacs.d/brianna-theme.el | 114 +++++++++++++++++++++++------------------------ 1 file changed, 56 insertions(+), 58 deletions(-) (limited to 'emacs.d/brianna-theme.el') diff --git a/emacs.d/brianna-theme.el b/emacs.d/brianna-theme.el index 43223f6..a4cd74d 100644 --- a/emacs.d/brianna-theme.el +++ b/emacs.d/brianna-theme.el @@ -17,7 +17,11 @@ ;; :inverse-video nil :extend nil))) "Specification to clear a given face.") -(defface brianna-prompt '((t (:foreground "purple"))) +(defun fclear (face) + "Set FACE spec to `fclear' --- inside `custom-theme-set-faces'." + (list face fclear)) + +(defface brianna-prompt '((t (:inherit bold))) "A face for prompts.") (defface brianna-input-field '((t ( :background "lavender" @@ -31,40 +35,37 @@ :background "alice blue")))) ;; Font lock -- clear - `(font-lock-bracket-face ,fclear) - `(font-lock-builtin-face ,fclear) - ;; `(font-lock-comment-delimiter-face ,fclear) - ;; `(font-lock-comment-face ,fclear) - `(font-lock-constant-face ,fclear) - `(font-lock-delimiter-face ,fclear) - ;; `(font-lock-doc-face ,fclear) - `(font-lock-doc-markup-face ,fclear) - `(font-lock-escape-face ,fclear) - `(font-lock-function-call-face ,fclear) - `(font-lock-function-name-face ,fclear) - ;; `(font-lock-keyword-face ,fclear) - `(font-lock-misc-punctuation-face ,fclear) - `(font-lock-negation-char-face ,fclear) - `(font-lock-number-face ,fclear) - `(font-lock-operator-face ,fclear) - `(font-lock-preprocessor-face ,fclear) - `(font-lock-property-name-face ,fclear) - `(font-lock-property-use-face ,fclear) - `(font-lock-punctuation-face ,fclear) - `(font-lock-regexp-face ,fclear) - `(font-lock-regexp-grouping-backslash ,fclear) - `(font-lock-regexp-grouping-construct ,fclear) - `(font-lock-string-face ,fclear) - `(font-lock-type-face ,fclear) - `(font-lock-variable-name-face ,fclear) - `(font-lock-variable-use-face ,fclear) - `(font-lock-warning-face ,fclear) + (fclear 'font-lock-bracket-face) + (fclear 'font-lock-builtin-face) + (fclear 'font-lock-constant-face) + (fclear 'font-lock-delimiter-face) + (fclear 'font-lock-doc-markup-face) + (fclear 'font-lock-escape-face) + (fclear 'font-lock-function-call-face) + (fclear 'font-lock-function-name-face) + (fclear 'font-lock-keyword-face) + (fclear 'font-lock-misc-punctuation-face) + (fclear 'font-lock-negation-char-face) + (fclear 'font-lock-number-face) + (fclear 'font-lock-operator-face) + (fclear 'font-lock-preprocessor-face) + (fclear 'font-lock-property-name-face) + (fclear 'font-lock-property-use-face) + (fclear 'font-lock-punctuation-face) + (fclear 'font-lock-regexp-face) + (fclear 'font-lock-regexp-grouping-backslash) + (fclear 'font-lock-regexp-grouping-construct) + (fclear 'font-lock-type-face) + (fclear 'font-lock-variable-name-face) + (fclear 'font-lock-variable-use-face) + (fclear 'font-lock-warning-face) ;; Font lock '(font-lock-comment-delimiter-face ((t (:slant italic)))) '(font-lock-comment-face ((t (:slant italic)))) - '(font-lock-doc-face ((t (:slant italic)))) - '(font-lock-keyword-face ((t (:weight bold)))) + '(font-lock-string-face ((t (:weight bold)))) + '(font-lock-doc-face ((t (:inherit (font-lock-string-face + font-lock-comment-face))))) ;; Propertized text '(bold ((t (:weight bold)))) @@ -105,6 +106,16 @@ '(vertical-border ((t (:foreground "gray")))) ;;; Specific modes &c + ;; Outline --- these go first b/c so many other headlines inherit from them + '(outline-1 ((t (:inherit (bold underline italic) :extend t)))) + '(outline-2 ((t (:inherit (bold underline))))) + '(outline-3 ((t (:inherit (italic underline))))) + '(outline-3 ((t (:inherit (italic underline))))) + '(outline-4 ((t (:inherit (italic underline))))) + '(outline-5 ((t (:inherit (italic underline))))) + '(outline-6 ((t (:inherit (italic underline))))) + '(outline-7 ((t (:inherit (italic underline))))) + '(outline-8 ((t (:inherit (italic underline))))) ;; Dired '(dired-header ((t (:underline t :extend t)))) ;; Elastic indent @@ -114,17 +125,14 @@ ;; Eww '(eww-form-text ((t (:inherit brianna-input-field)))) ;; Gemtext mode - '(gemtext-face-heading1 ((t ( :weight bold - :inherit variable-pitch)))) - '(gemtext-face-heading2 ((t ( :weight bold - :inherit variable-pitch)))) - '(gemtext-face-heading3 ((t ( :weight bold - :inherit variable-pitch)))) + '(gemtext-face-heading1 ((t (:inherit outline-1)))) + '(gemtext-face-heading2 ((t (:inherit outline-2)))) + '(gemtext-face-heading3 ((t (:inherit outline-3)))) ;; Info - '(info-title-1 ((t (:inherit variable-pitch)))) - '(info-title-2 ((t (:inherit variable-pitch)))) - '(info-title-3 ((t (:inherit variable-pitch)))) - '(info-title-4 ((t (:inherit variable-pitch)))) + '(info-title-1 ((t (:inherit outline-1)))) + '(info-title-2 ((t (:inherit outline-2)))) + '(info-title-3 ((t (:inherit outline-3)))) + '(info-title-4 ((t (:inherit outline-4)))) ;; Jabber '(jabber-activity-face ((t (:inherit italic)))) '(jabber-activity-personal-face ((t (:inherit rcirc-track-nick)))) @@ -136,23 +144,13 @@ '(jabber-chat-text-local ((t (:inherit default)))) '(jabber-muc-presence-dim ((t (:inherit shadow)))) '(jabber-rare-time-face ((t (:inherit shadow)))) - '(jabber-title-large ((t (:inherit (variable-pitch outline-1))))) - '(jabber-title-medium ((t (:inherit (variable-pitch outline-2))))) - '(jabber-title-small ((t (:inherit (variable-pitch outline-3))))) - ;; Outline - '(outline-1 ((t (:inherit (bold underline italic) :extend t)))) - '(outline-2 ((t (:inherit (bold underline))))) - '(outline-3 ((t (:inherit (italic underline))))) - '(outline-3 ((t (:inherit (italic underline))))) - '(outline-4 ((t (:inherit (italic underline))))) - '(outline-5 ((t (:inherit (italic underline))))) - '(outline-6 ((t (:inherit (italic underline))))) - '(outline-7 ((t (:inherit (italic underline))))) - '(outline-8 ((t (:inherit (italic underline))))) + '(jabber-title-large ((t (:inherit outline-1)))) + '(jabber-title-medium ((t (:inherit outline-2)))) + '(jabber-title-small ((t (:inherit outline-3)))) ;; Org - '(org-document-info-keyword ((t (:inherit default)))) - '(org-document-info ((t (:foreground "navy")))) - '(org-document-title ((t (:inherit org-document-info)))) + (fclear 'org-document-info-keyword) + (fclear 'org-document-info) + (fclear 'org-document-title) '(org-drawer ((t (:inherit font-lock-comment-face)))) ;; RCIRC '(rcirc-my-nick ((t (:weight bold :slant italic)))) @@ -165,7 +163,7 @@ ;; Sh '(sh-heredoc ((t ( :background "azure" :extend t :inherit font-lock-string-face)))) - '(sh-quoted-exec ((t ()))) + (fclear 'sh-quoted-exec) ;; Widgets '(widget-field ((t (:inherit brianna-input-field)))) '(widget-single-line-field ((t (:inherit brianna-input-field)))) -- cgit 1.4.1-21-gabe81