diff options
| -rw-r--r-- | bard-emacs-modules/bard-emacs-org.el | 17 | ||||
| -rw-r--r-- | bard-emacs-modules/bard-emacs-package.el | 64 |
2 files changed, 67 insertions, 14 deletions
diff --git a/bard-emacs-modules/bard-emacs-org.el b/bard-emacs-modules/bard-emacs-org.el index 7f72b24..5b6cc9f 100644 --- a/bard-emacs-modules/bard-emacs-org.el +++ b/bard-emacs-modules/bard-emacs-org.el @@ -17,12 +17,17 @@ org-image-actual-width '(600) org-insert-heading-respect-content t) -;; Org todo keywords -(setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)" "KILLED(k)")) - org-todo-keyword-faces '(("TODO" . (:weight bold :foreground "#CC9393" :weight bold)) - ("WAIT" . (:weight bold :foreground "#DFAF8F" :weight bold)) - ("DONE" . (:weight bold :weight bold :foreground "#AFD8AF")) - ("KILLED" . (:weight bold :weight bold :foreground "#656555")))) +;; Org todo keywords - changed to using hl-todo faces fixed by modus/ef themes +;; (setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)" "KILLED(k)")) +;; org-todo-keyword-faces '(("TODO" . (:weight bold :foreground "#CC9393" :weight bold)) +;; ("WAIT" . (:weight bold :foreground "#DFAF8F" :weight bold)) +;; ("DONE" . (:weight bold :weight bold :foreground "#AFD8AF")) +;; ("KILLED" . (:weight bold :weight bold :foreground "#656555"))) +;; org-todo-keyword-faces '(("TODO" . (:weight bold :foreground "#ff5f59" :weight bold)) +;; ("WAIT" . (:weight bold :foreground "#fec43f" :weight bold)) +;; ("DONE" . (:weight bold :weight bold :foreground "#44bc44")) +;; ("KILLED" . (:weight bold :weight bold :foreground "#989898"))) +;; ) ;; Org Mode Key map (defun bard/org-mode-keybindings () diff --git a/bard-emacs-modules/bard-emacs-package.el b/bard-emacs-modules/bard-emacs-package.el index 59c7ee7..69247b1 100644 --- a/bard-emacs-modules/bard-emacs-package.el +++ b/bard-emacs-modules/bard-emacs-package.el @@ -44,6 +44,30 @@ (agenda-date 1.3) (agenda-structure variable-pitch light 1.8) (t variable-pitch))) + (defun bard/ef-themes-hl-todo-faces () + "Configure `hl-todo-keyword-faces' with Ef themes colors. The exact color values are taken from the active Ef theme." + (ef-themes-with-colors + (setq hl-todo-keyword-faces + `(("WAIT" . ,yellow) + ("TODO" . ,red) + ("NEXT" . ,blue) + ("THEM" . ,magenta) + ("PROG" . ,cyan-warmer) + ("OKAY" . ,green-warmer) + ("DONT" . ,yellow-warmer) + ("FAIL" . ,red-warmer) + ("BUG" . ,red-warmer) + ("DONE" . ,green) + ("NOTE" . ,blue-warmer) + ("KLUDGE" . ,cyan) + ("HACK" . ,cyan) + ("TEMP" . ,red) + ("FIXME" . ,red-warmer) + ("XXX+" . ,red-warmer) + ("REVIEW" . ,red) + ("DEPRECATED" . ,yellow))))) + + (add-hook 'ef-themes-post-load-hook #'bard/ef-themes-hl-todo-faces) ;; (load-theme 'ef-cyprus t) (define-key global-map (kbd "M-<f5>") #'ef-themes-toggle) (setq ef-themes-to-toggle '(ef-melissa-dark ef-melissa-light))) @@ -58,6 +82,29 @@ (agenda-date . (1.3)) (agenda-structure . (variable-pitch light 1.8)) (t . (1.1)))) + (defun bard/modus-themes-hl-todo-faces () + "Configure `hl-todo-keyword-faces' with Modus themes colors. The exact color values are taken from the active Modus theme." + (modus-themes-with-colors + (setq hl-todo-keyword-faces + `(("WAIT" . ,yellow) + ("TODO" . ,red) + ("NEXT" . ,blue) + ("THEM" . ,magenta) + ("PROG" . ,cyan-warmer) + ("OKAY" . ,green-warmer) + ("DONT" . ,yellow-warmer) + ("FAIL" . ,red-warmer) + ("BUG" . ,red-warmer) + ("DONE" . ,green) + ("NOTE" . ,blue-warmer) + ("KLUDGE" . ,cyan) + ("HACK" . ,cyan) + ("TEMP" . ,red) + ("FIXME" . ,red-warmer) + ("XXX+" . ,red-warmer) + ("REVIEW" . ,red) + ("DEPRECATED" . ,yellow))))) + (add-hook 'ef-themes-post-load-hook #'bard/modus-themes-hl-todo-faces) (setq modus-themes-to-toggle '(modus-vivendi modus-operandi-tinted)) (define-key global-map (kbd "<f5>") #'modus-themes-toggle)) @@ -221,14 +268,15 @@ :init (global-hl-todo-mode t) :config - (setq hl-todo-keyword-faces - '(("TODO" error bold) - ("FIXME" error bold) - ("WAIT" warning bold) - ("HACK" completions-common-part bold) - ("DEPRECATED" completions-annotations bold) - ("DONE" font-lock-doc-face bold) - ("BUG" error bold)))) + ;; (setq hl-todo-keyword-faces + ;; '(("TODO" error bold) + ;; ("FIXME" error bold) + ;; ("WAIT" warning bold) + ;; ("HACK" completions-common-part bold) + ;; ("DEPRECATED" completions-annotations bold) + ;; ("DONE" font-lock-doc-face bold) + ;; ("BUG" error bold))) + ) (use-package pdf-tools :ensure t) |