summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/emacs/modules/bd--popper.el2
-rw-r--r--.config/emacs/modules/bd--themes.el61
-rw-r--r--.config/guix/emacs-manifest.scm1
3 files changed, 26 insertions, 38 deletions
diff --git a/.config/emacs/modules/bd--popper.el b/.config/emacs/modules/bd--popper.el
index 03335f8..c5b6bc4 100644
--- a/.config/emacs/modules/bd--popper.el
+++ b/.config/emacs/modules/bd--popper.el
@@ -26,7 +26,7 @@
emms-playlist-mode
emms-browser-mode))
(popper-display-control 't)
- (popper-mode-line '(:eval (propertize " P" 'face 'mode-line-emphasis)))
+ (popper-mode-line nil)
(popper-group-function #'popper-group-by-project))
diff --git a/.config/emacs/modules/bd--themes.el b/.config/emacs/modules/bd--themes.el
index 6b1b2cf..0a79d2b 100644
--- a/.config/emacs/modules/bd--themes.el
+++ b/.config/emacs/modules/bd--themes.el
@@ -22,42 +22,29 @@ to.")
;;;; colors
-(defun modus-themes-custom-faces ()
- (modus-themes-with-colors
- (custom-set-faces
- `(vertical-border ((,class :foreground ,bg-inactive)))
-
- `(mode-line-inactive ((,class :background ,bg-main
- :foreground ,fg-active
- :box ,bg-dim)))
- `(mode-line-active ((,class :background ,bg-main
- :foreground ,fg-active
- :box ,bg-inactive)))
-
- `(hl-line ((,class :background ,magenta-nuanced-bg)))
-
- `(emms-playlist-track-face ((,class :foreground ,blue-nuanced-fg)))
- `(emms-playlist-selected-face ((,class :foreground ,fg-special-cold)))
- `(emms-browser-track-face ((,class :foreground ,blue-nuanced-fg))))))
-
-(add-hook 'modus-themes-after-load-theme-hook #'modus-themes-custom-faces)
-
-(setopt modus-themes-italic-constructs t
- modus-themes-bold-constructs t
- modus-themes-mixed-fonts t
- modus-themes-hl-line '(accented)
- modus-themes-subtle-line-numbers t
- modus-themes-paren-match '(intense)
- modus-themes-region '(bg-only)
- modus-themes-syntax '(faint)
- modus-themes-mode-line '(borderless)
- modus-themes-org-blocks 'gray-background
- modus-themes-headings '(
- (1 . (rainbow overline))))
-
-(load-theme 'modus-vivendi t)
-
-(modus-themes-custom-faces)
-
+(use-package ef-themes
+ :demand t
+ :config
+ ;; Disable all other themes to avoid awkward blending:
+ (mapc #'disable-theme custom-enabled-themes)
+ :custom
+ (ef-themes-mixed-fonts t)
+ (ef-themes-variable-pitch-ui t)
+ (ef-themes-headings
+ '((0 variable-pitch bold 1.6)
+ (1 variable-pitch bold 1.5)
+ (2 variable-pitch regular 1.4)
+ (3 variable-pitch regular 1.2)
+ (t variable-pitch regular 1.0)))
+
+ (ef-themes-to-toggle '(ef-winter ef-summer))
+ (ef-themes-common-palette-overrides
+ '((bg-mode-line bg-main)
+ (fg-mode-line fg-main)
+ (bg-alt bg-main)))
+ (ef-winter-palette-overrides
+ '((bg-main "#000000"))))
+
+(load-theme 'ef-dark :no-confirm)
(provide 'bd--themes)
diff --git a/.config/guix/emacs-manifest.scm b/.config/guix/emacs-manifest.scm
index b15038c..978b783 100644
--- a/.config/guix/emacs-manifest.scm
+++ b/.config/guix/emacs-manifest.scm
@@ -8,6 +8,7 @@
"emacs-all-the-icons"
"emacs-auctex"
"emacs-consult"
+ "emacs-ef-themes"
"emacs-emms"
"emacs-guix"
"emacs-htmlize"