diff options
Diffstat (limited to 'bard-emacs-modules/bard-emacs-theme.el')
| -rw-r--r-- | bard-emacs-modules/bard-emacs-theme.el | 177 |
1 files changed, 12 insertions, 165 deletions
diff --git a/bard-emacs-modules/bard-emacs-theme.el b/bard-emacs-modules/bard-emacs-theme.el index 011272c..c729379 100644 --- a/bard-emacs-modules/bard-emacs-theme.el +++ b/bard-emacs-modules/bard-emacs-theme.el @@ -3,153 +3,30 @@ ;; declare all themes as safe (i trust developers) (setq custom-safe-themes t) -;; Ef-themes -(use-package ef-themes +(use-package doom-themes :ensure t - :demand t - :hook - ((ef-themes-post-load . bard/ef-themes-hl-todo-faces) - (ef-themes-post-load . logos-update-fringe-in-buffers)) :config - (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) - ("KILLED" . ,cyan) - ("REVIEW" . ,red) - ("DEPRECATED" . ,yellow))))) - - (setq org-priority-faces - '((?A . (:inherit (bold next-error))) - (?B . org-priority) - (?C . (:inherit (shadow org-priority))))) - - (setq ef-themes-headings - '((0 variable-pitch bold 1.5) - (1 variable-pitch bold 1.3) - (2 regular 1.2) - (3 1.1) - (agenda-date . (variable-pitch bold 1.3)) - (agenda-structure . (variable-pitch bold 1.5)) - (t . 1.1))) - - ;; better faces in overrides - (setq ef-themes-common-palette-overrides - `((fringe unspecified) - (bg-line-number-active bg-hl-line) - (bg-line-number-inactive unspecified) - (fg-line-number-active fg-main) - (bg-tab-bar bg-dim))) - - ;; verbatim need higher contrast for org mode - (setq ef-elea-dark-palette-overrides - '((prose-verbatim yellow-cooler))) - - (setq ef-elea-light-palette-overrides - '((prose-verbatim yellow-cooler))) - - (define-key global-map (kbd "M-<f5>") #'ef-themes-select) - (setq ef-themes-variable-pitch-ui t - ef-themes-mixed-fonts t) - + (setq doom-gruvbox-dark-variant "hard") + (bard/select-theme 'doom-gruvbox) ) -(use-package modus-themes +(use-package doom-modeline :ensure t - :demand t - :bind - (("<f5>" . modus-themes-select)) - :hook ((modus-themes-post-load . bard/modus-themes-hl-todo-faces) - (modus-themes-post-load . logos-update-fringe-in-buffers)) :config - (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) - ("KILLED" . ,cyan) - ("DEPRECATED" . ,yellow))))) - - (setq modus-themes-headings - '((0 variable-pitch bold 1.5) - (1 variable-pitch bold 1.3) - (2 regular 1.2) - (3 1.1) - (agenda-date . (variable-pitch bold 1.3)) - (agenda-structure . (variable-pitch bold 1.5)) - (t . 1.1))) - - (setq modus-themes-custom-auto-reload nil - modus-themes-mixed-fonts t - modus-themes-variable-pitch-ui nil - modus-themes-italic-constructs t - modus-themes-bold-constructs nil - modus-themes-completions '((t . (extrabold))) - modus-themes-prompts '(extrabold)) - (setq modus-themes-common-palette-overrides - `((fringe unspecified) - (bg-line-number-active bg-hl-line) - (bg-line-number-inactive unspecified) - (fg-line-number-active fg-main) - (bg-tab-bar bg-dim))) - ;; org customization - (setq org-priority-faces - '((?A . (:inherit (bold next-error))) - (?B . org-priority) - (?C . (:inherit (shadow org-priority))))) - - ;; (load-theme 'modus-vivendi t) + (doom-modeline-mode t) + (setq doom-modeline-buffer-file-name-style 'buffer-name) ) -(use-package gruber-darker-theme - :ensure t - :config - (bard/select-theme 'gruber-darker)) - ;;;; Fonts (use-package fontaine - :ensure t + :ensure nil :config ;; save file (setq fontaine-latest-state-file (locate-user-emacs-file "fontaine-latest-state.eld")) ;; Set last preset or fall back to desired style from `fontaine-presets'. - (fontaine-set-preset (or (fontaine-restore-latest-preset) 'laptop)) + (fontaine-set-preset (or (fontaine-restore-latest-preset) 'default)) ;; The other side of `fontaine-restore-latest-preset'. (add-hook 'kill-emacs-hook #'fontaine-store-latest-preset) @@ -165,41 +42,11 @@ The exact color values are taken from the active Modus theme." (global-set-key (kbd "M-<f6>") #'bard/select-theme) -(use-package standard-themes - :ensure t - :init (standard-themes-select 'standard-light) - :config - (setq standard-themes-to-toggle '(standard-light - standard-dark)) - (add-hook 'standard-themes-post-load-hook #'logos-update-fringe-in-buffers) - - ;; headings - (setq standard-themes-headings - '((0 . (variable-pitch light 1.5)) - (1 . (variable-pitch light 1.3)) - (2 . (variable-pitch regular 1.2)) - (agenda-date . (semilight 1.4)) - (agenda-structure . (light 1.5)) - (t . (variable-pitch 1.1)))) - - (setq standard-themes-mixed-fonts t) - - :bind - ("<f6>" . standard-themes-toggle)) - -(use-package spacious-padding +(use-package mixed-pitch :ensure t - :config - (setq spacious-padding-widths - '( :internal-border-width 10 - :header-line-width 4 - :mode-line-width 6 - :tab-width 4 - :right-divider-width 1 - :left-fringe-width 0 - :right-fringe-width 0 - :scroll-bar-width 0)) - (spacious-padding-mode t)) + :hook + (org-mode . mixed-pitch-mode) + ) (provide 'bard-emacs-theme) |