theme: Fix git-annex.el face overrides

Use modus-themes-load-theme so that modus-themes-after-load-theme-hook
is triggered, don't try to set face if it is not yet defined, and
trigger modus-themes-after-load-theme-hook when git-annex.el loads.

1 files changed, 8 insertions, 6 deletions

diff --git a/init.el b/init.el
index 2eddc6f..080bca1 100644
--- a/init.el
+++ b/init.el
@@ -63,14 +63,15 @@
   (add-to-list 'modus-themes-org-agenda '(header-block . (no-scale)))
 
   (defun km/modus-themes-set-custom-faces ()
-    (set-face-attribute 'git-annex-dired-annexed-available nil
-                        :foreground (modus-themes-color 'green))
-    (set-face-attribute 'git-annex-dired-annexed-unavailable nil
-                        :foreground (modus-themes-color 'red)))
+    (when (featurep 'git-annex)
+      (set-face-attribute 'git-annex-dired-annexed-available nil
+                          :foreground (modus-themes-color 'green))
+      (set-face-attribute 'git-annex-dired-annexed-unavailable nil
+                          :foreground (modus-themes-color 'red))))
   (add-hook 'modus-themes-after-load-theme-hook
             #'km/modus-themes-set-custom-faces)
 
-  (load-theme 'modus-operandi t))
+  (modus-themes-load-theme 'modus-operandi))
 
 
 ;;; Custom prefix maps
@@ -889,7 +890,8 @@
 
 (use-package git-annex
   :config
-  (setq git-annex-commit nil))
+  (setq git-annex-commit nil)
+  (run-hooks 'modus-themes-after-load-theme-hook))
 
 (use-package compat
   :load-path "~/src/emacs/compat/")