Updates

2 files changed, 25 insertions, 6 deletions

diff --git a/doom/config.el b/doom/config.el
index 1413521..54d71ac 100644
--- a/doom/config.el
+++ b/doom/config.el
@@ -32,7 +32,10 @@
 ;; There are two ways to load a theme. Both assume the theme is installed and
 ;; available. You can either set `doom-theme' or manually load a theme with the
 ;; `load-theme' function. This is the default:
-(setq doom-theme 'doom-one)
+(setq doom-theme 'doom-plain-dark)
+
+(custom-set-faces!
+  '(default :background "#131313" :foreground "#FCFCFC"))
 
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
@@ -93,9 +96,25 @@
   (require 'evil-collection))
 
 (after! solaire-mode
-  (solaire-global-mode -1))
+  (solaire-global-mode -1)
+  (defun my/neutralize-solaire-faces (&optional _frame)
+    "Force solaire's lighter backgrounds to match the default background."
+    (dolist (face '(solaire-default-face
+                    solaire-hl-line-face
+                    solaire-org-hide-face
+                    solaire-mode-line-face
+                    solaire-mode-line-inactive-face
+                    solaire-header-line-face
+                    solaire-header-line-inactive-face
+                    solaire-line-number-face
+                    solaire-fringe-face))
+      (when (facep face)
+        (set-face-attribute face nil :background 'unspecified :inherit 'default))))
+  (my/neutralize-solaire-faces)
+  (add-hook 'doom-load-theme-hook #'my/neutralize-solaire-faces 30)
+  (add-hook 'after-make-frame-functions #'my/neutralize-solaire-faces))
 
-(defvar my/gui-transparency 85
+(defvar my/gui-transparency 99
   "Alpha background value for GUI frames (0-100).")
 
 (defun my/make-all-faces-transparent (&optional frame)
diff --git a/doom/init.el b/doom/init.el
index 4465f3d..b57d64e 100644
--- a/doom/init.el
+++ b/doom/init.el
@@ -100,15 +100,15 @@
        magit             ; a git porcelain for Emacs
        make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
-       ;;pdf               ; pdf enhancements
+       pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
        ;;terraform         ; infrastructure as code
        ;;tmux              ; an API for interacting with tmux
-       ;;tree-sitter       ; syntax and parsing, sitting in a tree...
+       tree-sitter       ; syntax and parsing, sitting in a tree...
        ;;upload            ; map local to remote projects via ssh/ftp
 
        :os
-       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
+       ;;(:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
        ;;tty               ; improve the terminal Emacs experience
 
        :lang