diff options
Diffstat (limited to '.config/emacs/modules/bd--themes.el')
| -rw-r--r-- | .config/emacs/modules/bd--themes.el | 137 |
1 files changed, 87 insertions, 50 deletions
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el index ddcfcf2..cd24cab 100644 --- a/.config/emacs/modules/bd--themes.el +++ b/.config/emacs/modules/bd--themes.el @@ -3,76 +3,113 @@ ;;; Code: -(defun bd/enable-variable-pitch-exempt () - "Text modes to exempt from variable pitch fonts." - (unless (derived-mode-p 'latex-mode 'mhtml-mode 'nxml-mode 'yaml-mode) - (variable-pitch-mode 1))) - -(defvar bd/enable-variable-pitch-in-hooks - '(text-mode-hook) - "List of hook symbols to add `variable-pitch-mode' -to.") - -(mapc - (lambda (hook) - (add-hook hook #'bd/enable-variable-pitch-exempt)) - bd/enable-variable-pitch-in-hooks) - -(set-face-attribute 'variable-pitch nil - :family "Dejavu Math TeX Gyre" - :height 110) -(set-face-attribute 'fixed-pitch nil - :family "Terminus" - :height 110) -(set-face-attribute 'default nil - :family "Terminus" - :height 140) - - (use-package modus-themes :load-path (lambda () (expand-file-name "themes/" data-directory)) :demand t + :init + (load-theme 'modus-vivendi-tinted t) + :hook + ((modus-themes-post-load . bd/modus-set-faces)) :config - ;; Disable all other themes to avoid awkward blending: - (mapc #'disable-theme custom-enabled-themes) (defun bd/modus-set-faces (&rest _) "Blends the modeline with the echo area, and some other minor face changes." (modus-themes-with-colors (custom-set-faces - `(mode-line ((,c :overline ,keyword))) - `(mode-line-inactive ((,c :overline ,bg-button-inactive))) - `(eshell-prompt ((,c :foreground ,fg-main :background ,bg-dim :height 1.1 :extend t)))))) - (add-hook 'modus-themes-post-load-hook #'bd/modus-set-faces) - + `(eshell-prompt ((,c :foreground ,fg-main :background ,bg-prose-block-contents :height 1.1 :extend t)))))) (setopt modus-themes-to-toggle '(modus-operandi-tinted modus-vivendi-tinted) modus-themes-mixed-fonts t modus-themes-italic-constructs t modus-themes-bold-constructs t - modus-themes-variable-pitch-ui nil + modus-themes-variable-pitch-ui t + modus-themes-prompts '(bold) modus-themes-headings - '((0 variable-pitch bold 1.5) - (1 variable-pitch bold 1.4) + '((0 variable-pitch regular 1.4) + (1 variable-pitch regular 1.4) (2 variable-pitch regular 1.3) - (3 variable-pitch regular 1.1) - (t variable-pitch regular 1.0)) - + (3 variable-pitch regular 1.2) + (t variable-pitch regular 1.2)) modus-themes-common-palette-overrides - '((bg-mode-line-active bg-main) - (bg-mode-line-inactive bg-main) - (border-mode-line-active bg-main) - (border-mode-line-inactive bg-main) - (bg-line-number-active bg-dim) - (bg-line-number-inactive bg-dim) - (fg-heading-1 fg-term-blue-bright) - (fg-heading-2 fg-term-magenta-bright) + '((bg-main "#000B0E") ;; primary + (bg-active bg-main) + (fg-main "#c6b7ad") + (fg-active fg-main) + (fg-mode-line-active "#008EA2") + (bg-mode-line-active "#012C31") ;; primary + (fg-mode-line-inactive "#8D6D91") + (bg-mode-line-inactive "#442c50") ;; secondary + (border-mode-line-active nil) + (border-mode-line-inactive nil) (bg-tab-bar bg-main) - (bg-tab-current bg-main) - (bg-tab-other bg-button-inactive)))) + (bg-tab-current "#042429") ;; primary + (bg-tab-other "#100014") ;; secondary + + (fg-heading-0 "#b2ebf2") + (fg-heading-1 "#98fb98") + (fg-heading-2 "#fa80e6") + (fg-heading-3 "#ff7f50") + (fg-heading-4 "#ffd700") + + (fg-prompt "#FF4E00") ;; tertiary + (bg-prompt unspecified) + + (bg-region "#E65C19") ;; tertiary + (fg-region "#fffff0") -(load-theme 'modus-vivendi-tinted :no-confirm) + (bg-hl-line "#034852") ;; primary + + (fg-line-number-active fg-main) + (fg-line-number-inactive "#a9a9a9") + (bg-line-number-active unspecified) + (bg-line-number-inactive "#0D5D62") ;; primary + + (fringe bg-main) + (cursor "#FF5300") ;; tertiary + + (fg-prose-verbatim "#af9fff") + (bg-prose-block-contents "#244449") ;; primary + (fg-prose-block-delimiter "#c6b7ad") + (bg-prose-block-delimiter bg-prose-block-contents) + + (keyword "#4dd0e1") + (builtin "#a490ff") + (comment "#afa7b0") + (string "#50f2ca") + (fnname "#d8afd8") + (type "#89c6f9") + (variable "#98fb98") + (docstring "#f0e68c") + (constant "#fa80e6")))) (run-hooks 'modus-themes-post-load-hook) +(defun bd/enable-variable-pitch-exempt () + "Text modes to exempt from variable pitch fonts." + (unless (derived-mode-p 'latex-mode 'mhtml-mode 'nxml-mode 'yaml-mode) + (variable-pitch-mode 1))) + +(defvar bd/enable-variable-pitch-in-hooks + '(text-mode-hook) + "List of hook symbols to add `variable-pitch-mode' +to.") + +(mapc + (lambda (hook) + (add-hook hook #'bd/enable-variable-pitch-exempt)) + bd/enable-variable-pitch-in-hooks) + +(set-face-attribute 'variable-pitch nil + :family "Dejavu Serif" + :height 130) +(set-face-attribute 'fixed-pitch nil + :family "Iosevka" + :height 100) +(set-face-attribute 'default nil + :family "Iosevka" + :height 140) +(set-face-attribute 'modus-themes-ui-variable-pitch nil + :family "Iosevka" + :height 90) + (provide 'bd--themes) ;;; bd--themes.el ends here |