From 9d72997be082fc8d9f86c647bff18ea528217483 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 16 Jul 2022 00:01:44 +0100
Subject: [PATCH] feat(ui): add solaire-mode

---
 core/siren-core-modules.el                  |  7 ++++---
 modules/ui/siren-solaire-mode.el            | 19 +++++++++++++++++++
 straight/versions/default.el                |  1 +
 themes/siren-doom-themes-overrides-theme.el |  5 +++++
 4 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 modules/ui/siren-solaire-mode.el

diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index ecf205a..5a3c7ab 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -13,6 +13,10 @@
 ;; Theme
 (require 'siren-doom-themes)
 
+;; UI
+(require 'siren-pixel-scroll)
+(require 'siren-solaire-mode)
+
 ;; Core
 (require 'siren-aliases)
 (require 'siren-global-keybindings)
@@ -47,9 +51,6 @@
 (require 'siren-which-key)
 (require 'siren-whitespace)
 
-;; UI
-(require 'siren-pixel-scroll)
-
 ;; Completion Systems and Interfaces
 (require 'siren-vertico)
 (require 'siren-fussy)
diff --git a/modules/ui/siren-solaire-mode.el b/modules/ui/siren-solaire-mode.el
new file mode 100644
index 0000000..b94c463
--- /dev/null
+++ b/modules/ui/siren-solaire-mode.el
@@ -0,0 +1,19 @@
+;;; siren-solaire-mode.el --- jimeh's Emacs Siren: solaire-mode.
+
+;;; Commentary:
+
+;; Basic configuration for solaire-mode.
+
+;;; Code:
+
+(use-package solaire-mode
+  :config
+  ;; Prevent solaire-mode from overriding the modeline faces. The difference in
+  ;; color between normal buffers and special is confusing and annoying.
+  (dolist (face '(mode-line mode-line-active mode-line-inactive))
+    (setf (alist-get face solaire-mode-remap-alist) nil))
+
+  (solaire-global-mode +1))
+
+(provide 'siren-solaire-mode)
+;;; siren-solaire-mode.el ends here
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 41e95ac..ef57ad1 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -58,6 +58,7 @@
  ("emacs-request" . "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b")
  ("emacs-shfmt" . "279a51defa3e0d97dc40b8a26e078699d4e22e90")
  ("emacs-slim" . "3636d18ab1c8b316eea71c4732eb44743e2ded87")
+ ("emacs-solaire-mode" . "8af65fbdc50b25ed3214da949b8a484527c7cc14")
  ("emacs-which-key" . "1ab1d0cc88843c9a614ed3226c5a1070e32e4823")
  ("emacsmirror-mirror" . "ebaa7a97ab71b1af4236e730e54845b380eb1792")
  ("emacsql" . "373975cbccf7776af771e23f86043b236a330702")
diff --git a/themes/siren-doom-themes-overrides-theme.el b/themes/siren-doom-themes-overrides-theme.el
index 49edeac..b961ff9 100644
--- a/themes/siren-doom-themes-overrides-theme.el
+++ b/themes/siren-doom-themes-overrides-theme.el
@@ -152,6 +152,11 @@
   '(orderless-match-face-2 :foreground (doom-blend magenta red 0.4))
   '(orderless-match-face-3 :foreground (doom-blend magenta red 0.7))
 
+  ;; solaire-mode
+  '(solaire-hl-line-face :inherit 'hl-line
+                         :background (doom-blend region bg-alt 0.35)
+                         :extend t)
+
   ;; helm
   '(helm-selection :inherit 'bold
                    :background (doom-blend violet bg 0.2)