Rewrite how themes are loaded, and fonts reloaded

A follow-up to 578dddd, which wasn't sufficient.

Fixes #5000 (again)

modules/ui/doom/config.el

@@ -8,8 +8,7 @@
 (use-package! doom-themes
   :defer t
   :init
-  (unless doom-theme
-    (setq doom-theme 'doom-one))
+  (setq doom-theme 'doom-one)
   ;; improve integration w/ org-mode
   (add-hook 'doom-load-theme-hook #'doom-themes-org-config)
   ;; more Atom-esque file icons for neotree/treemacs

modules/ui/indent-guides/config.el

@@ -15,7 +15,7 @@
   ;;      access to 256 colors. So if the user uses a daemon we must wait for
   ;;      the first graphical frame to be available to do.
   (add-hook 'doom-load-theme-hook #'+indent-guides-init-faces-h)
-  (when doom-init-theme-p
+  (when doom-theme
     (+indent-guides-init-faces-h))
 
   ;; `highlight-indent-guides' breaks when `org-indent-mode' is active