diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auto-dim-config.el | 18 | ||||
| -rw-r--r-- | modules/org-config.el | 32 |
2 files changed, 35 insertions, 15 deletions
diff --git a/modules/auto-dim-config.el b/modules/auto-dim-config.el index 83c5b17c..5ce426d2 100644 --- a/modules/auto-dim-config.el +++ b/modules/auto-dim-config.el @@ -54,7 +54,23 @@ (font-lock-constant-face . (auto-dim-other-buffers . nil)) (font-lock-builtin-face . (auto-dim-other-buffers . nil)) (font-lock-preprocessor-face . (auto-dim-other-buffers . nil)) - (font-lock-warning-face . (auto-dim-other-buffers . nil)))) + (font-lock-warning-face . (auto-dim-other-buffers . nil)) + ;; Org TODO-keyword + priority faces dim to their own -dim variant + ;; (a darker shade of the same colour) rather than the flat gray, so + ;; a dimmed window's keywords stay recognizable. Faces are defined + ;; in themes/dupre-faces.el and wired in modules/org-config.el. + (dupre-org-todo . (dupre-org-todo-dim . nil)) + (dupre-org-project . (dupre-org-project-dim . nil)) + (dupre-org-doing . (dupre-org-doing-dim . nil)) + (dupre-org-waiting . (dupre-org-waiting-dim . nil)) + (dupre-org-verify . (dupre-org-verify-dim . nil)) + (dupre-org-stalled . (dupre-org-stalled-dim . nil)) + (dupre-org-failed . (dupre-org-failed-dim . nil)) + (dupre-org-done . (dupre-org-done-dim . nil)) + (dupre-org-priority-a . (dupre-org-priority-a-dim . nil)) + (dupre-org-priority-b . (dupre-org-priority-b-dim . nil)) + (dupre-org-priority-c . (dupre-org-priority-c-dim . nil)) + (dupre-org-priority-d . (dupre-org-priority-d-dim . nil)))) (auto-dim-other-buffers-mode 1)) (provide 'auto-dim-config) diff --git a/modules/org-config.el b/modules/org-config.el index 01586a9e..90dd09b0 100644 --- a/modules/org-config.el +++ b/modules/org-config.el @@ -101,25 +101,29 @@ "DELEGATED(x)" "|" "FAILED(f!)" "DONE(d!)" "CANCELLED(c!)"))) + ;; Keyword and priority colors come from the active theme's dupre-org-* + ;; faces (themes/dupre-faces.el) rather than hard-coded color names, so they + ;; match the palette and dim with the rest of an unfocused window + ;; (auto-dim-config.el remaps each to its -dim variant). (setq org-todo-keyword-faces - '(("TODO" . "green") - ("PROJECT" . "blue") - ("DOING" . "yellow") - ("WAITING" . "white") - ("VERIFY" . "orange") - ("STALLED" . "light blue") - ("DELEGATED" . "green") - ("FAILED" . "red") - ("DONE" . "dark grey") - ("CANCELLED" . "dark grey"))) + '(("TODO" . dupre-org-todo) + ("PROJECT" . dupre-org-project) + ("DOING" . dupre-org-doing) + ("WAITING" . dupre-org-waiting) + ("VERIFY" . dupre-org-verify) + ("STALLED" . dupre-org-stalled) + ("DELEGATED" . dupre-org-todo) + ("FAILED" . dupre-org-failed) + ("DONE" . dupre-org-done) + ("CANCELLED" . dupre-org-done))) (setq org-highest-priority ?A) (setq org-lowest-priority ?D) (setq org-default-priority ?D) - (setq org-priority-faces '((?A . (:foreground "Cyan" :weight bold)) - (?B . (:foreground "Yellow")) - (?C . (:foreground "Green")) - (?D . (:foreground "Grey")))) + (setq org-priority-faces '((?A . dupre-org-priority-a) + (?B . dupre-org-priority-b) + (?C . dupre-org-priority-c) + (?D . dupre-org-priority-d))) (setq org-enforce-todo-dependencies t) (setq org-enforce-todo-checkbox-dependencies t) |