emacs:(aesthetics) Update modus-themes configuration & remove doom

1 files changed, 62 insertions, 106 deletions

diff --git a/.emacs.d/modules/thanos-aesthetics.el b/.emacs.d/modules/thanos-aesthetics.el
index d18b4ee..23d86a4 100644
--- a/.emacs.d/modules/thanos-aesthetics.el
+++ b/.emacs.d/modules/thanos-aesthetics.el
@@ -88,116 +88,72 @@
  (if is-hermes '(default ((t (:inherit nil :height 120 :family "Jetbrains Mono"))))
    '(default ((t (:inherit nil :height 130 :family "Jetbrains Mono"))))))
 
+(require 'modus-themes)
 ;; Modus-themes configuration
-(setf modus-themes-italic-constructs t
+(setq modus-themes-italic-constructs t
       modus-themes-bold-constructs nil
       modus-themes-mixed-fonts nil
-      modus-themes-subtle-line-numbers t
-      modus-themes-intense-mouseovers nil
-      modus-themes-deuteranopia t
-      modus-themes-tabs-accented t
       modus-themes-variable-pitch-ui nil
-      modus-themes-inhibit-reload t ; only applies to `customize-set-variable' and related
-      modus-themes-fringes nil ; {nil,'subtle,'intense}
-      ;; Options for `modus-themes-lang-checkers' are either nil (the
-      ;; default), or a list of properties that may include any of those
-      ;; symbols: `straight-underline', `text-also', `background',
-      ;; `intense' OR `faint'.
-      modus-themes-lang-checkers nil
-      ;; Options for `modus-themes-mode-line' are either nil, or a list
-      ;; that can combine any of `3d' OR `moody', `borderless',
-      ;; `accented', a natural number for extra padding (or a cons cell
-      ;; of padding and NATNUM), and a floating point for the height of
-      ;; the text relative to the base font size (or a cons cell of
-      ;; height and FLOAT)
-      modus-themes-mode-line '(accented borderless (padding . 2) (height . 1.0))
-      ;; Same as above:
-      ;; modus-themes-mode-line '(accented borderless 4 0.9)
-
-      ;; Options for `modus-themes-markup' are either nil, or a list
-      ;; that can combine any of `bold', `italic', `background',
-      ;; `intense'.
-      modus-themes-markup '(background bold italic)
-
-      ;; Options for `modus-themes-syntax' are either nil (the default),
-      ;; or a list of properties that may include any of those symbols:
-      ;; `faint', `yellow-comments', `green-strings', `alt-syntax'
-      modus-themes-syntax '(green-strings)
-
-      ;; Options for `modus-themes-hl-line' are either nil (the default),
-      ;; or a list of properties that may include any of those symbols:
-      ;; `accented', `underline', `intense'
-      modus-themes-hl-line '(underline accented)
-
-      ;; Options for `modus-themes-paren-match' are either nil (the
-      ;; default), or a list of properties that may include any of those
-      ;; symbols: `bold', `intense', `underline'
-      modus-themes-paren-match '(bold intense)
-
-      ;; Options for `modus-themes-links' are either nil (the default),
-      ;; or a list of properties that may include any of those symbols:
-      ;; `neutral-underline' OR `no-underline', `faint' OR `no-color',
-      ;; `bold', `italic', `background'
-      modus-themes-links '(neutral-underline italic)
-
-      ;; Options for `modus-themes-box-buttons' are either nil (the
-      ;; default), or a list that can combine any of `flat', `accented',
-      ;; `faint', `variable-pitch', `underline', `all-buttons', the
-      ;; symbol of any font weight as listed in `modus-themes-weights',
-      ;; and a floating point number (e.g. 0.9) for the height of the
-      ;; button's text.
-      modus-themes-box-buttons '(variable-pitch flat faint 0.9)
-
-      ;; Options for `modus-themes-prompts' are either nil (the
-      ;; default), or a list of properties that may include any of those
-      ;; symbols: `background', `bold', `gray', `intense', `italic'
-      modus-themes-prompts '(intense)
-
-      ;; The `modus-themes-completions' is an alist that reads three
-      ;; keys: `matches', `selection', `popup'.  Each accepts a nil
-      ;; value (or empty list) or a list of properties that can include
-      ;; any of the following (for WEIGHT read further below):
-      ;;
-      ;; `matches' - `background', `intense', `underline', `italic', WEIGHT
-      ;; `selection' - `accented', `intense', `underline', `italic', `text-also' WEIGHT
-      ;; `popup' - same as `selected'
-      ;; `t' - applies to any key not explicitly referenced (check docs)
-      ;;
-      ;; WEIGHT is a symbol such as `semibold', `light', or anything
-      ;; covered in `modus-themes-weights'.  Bold is used in the absence
-      ;; of an explicit WEIGHT.
-      modus-themes-completions '((matches . (bold underline))
-				 (selection . (semibold accented))
-				 (popup . (accented intense)))
-
-      modus-themes-mail-citations nil ; {nil,'intense,'faint,'monochrome}
-
-      ;; Options for `modus-themes-region' are either nil (the default),
-      ;; or a list of properties that may include any of those symbols:
-      ;; `no-extend', `bg-only', `accented'
-      modus-themes-region '(bg-only no-extend)
-
-      ;; Options for `modus-themes-diffs': nil, 'desaturated, 'bg-only
-      modus-themes-diffs 'desaturated
-
-      modus-themes-org-blocks 'gray-background ; {nil,'gray-background,'tinted-background}
-
-      modus-themes-org-agenda ; this is an alist: read the manual or its doc string
-      '((header-block . (variable-pitch 1.3))
-	(header-date . (grayscale workaholic bold-today 1.1))
-	(event . (accented varied))
-	(scheduled . uniform)
-	(habit . traffic-light))
-
-      modus-themes-headings ; this is an alist: read the manual or its doc string
-      '((1 . (overline background variable-pitch 1.3))
-	(2 . (rainbow overline 1.1))
-	(t . (semibold))))
-
-
-(load-theme 'doom-monokai-classic)
-(doom-modeline-mode 1)
-(setf doom-modeline-height 35)
+      modus-themes-custom-auto-reload t
+      modus-themes-disable-other-themes t
+      modus-themes-prompts '(italic bold)
+      modus-themes-completions '((matches . (extrabold))
+				 (selection . (semibold italic text-also underline)))
+      modus-themes-org-blocks 'tinted-background)
+
+(setq modus-themes-common-palette-overrides
+      '((fg-line-number-inactive "gray40")
+        (fg-line-number-active cyan-intense)
+	;; bg values:
+	;;   molokai: #1c1e1f
+	;;   1337: #191919
+	;;   gruvbox: #282828
+	;;   henna: #21272e
+	;;   monokai: #272822
+	;;   badger: #171717
+	;;   ayu-dark: #0d1017
+	(bg-main "#171717")
+	;; (overline-heading-1 gold)
+	(fg-heading-1 red-warmer)
+	;; (bg-heading-1 bg-blue-nuanced)
+        (bg-line-number-inactive unspecified)
+        (bg-line-number-active unspecified)
+	(bg-paren-match bg-magenta-intense)
+        (underline-paren-match fg-main)
+	(underline-err red-intense)
+        (underline-warning yellow-faint)
+        (underline-note cyan-faint)
+	(string green)
+	(border-mode-line-active bg-mode-line-active)
+        (border-mode-line-inactive bg-mode-line-inactive)
+	(bg-mode-line-active bg-lavender)
+	;; set fg from badger theme
+        (fg-mode-line-active "#F6F3E8")
+        (border-mode-line-active blue-intense)
+	(bg-hl-line bg-dim)
+	(cursor slate)
+	,@modus-themes-preset-overrides-intense))
+
+(setq modus-themes-headings
+      '((1 . (ultrabold  1.35))
+        (2 . (semibold  1.2))
+        (agenda-date . (1.3))
+        (agenda-structure . (variable-pitch light 1.8))
+        (t . (1.15))))
+
+(defun theme-invisible-dividers (_theme)
+  "Make window dividers for THEME invisible."
+  (let ((bg (face-background 'default)))
+    (custom-set-faces
+     `(fringe ((t :background ,bg :foreground ,bg)))
+     `(window-divider ((t :background ,bg :foreground ,bg)))
+     `(window-divider-first-pixel ((t :background ,bg :foreground ,bg)))
+     `(window-divider-last-pixel ((t :background ,bg :foreground ,bg))))))
+
+(add-hook 'enable-theme-functions #'theme-invisible-dividers)
+
+
+(load-theme 'modus-vivendi)
 
 ;; Don't display battery-mode on desktop
 (if is-zeus