theme tweaks

1 files changed, 4 insertions, 23 deletions

diff --git a/init.el b/init.el
index 25f031c..067b041 100644
--- a/init.el
+++ b/init.el
@@ -114,6 +114,8 @@
    (jao-exec-path p))
  (add-to-list 'Info-directory-list "/opt/homebrew/share/info"))
 
+(jao-exec-path (expand-file-name "bin" jao-emacs-dir))
+
 ;;;; custom location of custom.el and co.
 (setq custom-file (jao-site-el "custom"))
 (load custom-file)
@@ -419,7 +421,7 @@
 
 ;;;; themes
 (defun jao-colors-scheme-dark-p ()
-  (equal "dark" (getenv "JAO_COLOR_SCHEME")))
+  (and (jao-is-linux) (equal "dark" (getenv "JAO_COLOR_SCHEME"))))
 
 (defun jao-colors-scheme ()
   (if (jao-colors-scheme-dark-p) 'dark 'light))
@@ -445,28 +447,7 @@
     (load-theme theme t)
     (modify-all-frames-parameters `((font . ,jao-themes-default-face)))))
 
-(use-package doric-themes
-  :if (jao-is-darwin)
-  :ensure t
-  :demand t
-  :config
-  ;; These are the default values.
-  (setq doric-themes-to-toggle '(doric-light doric-marble))
-  (setq doric-themes-to-rotate doric-themes-collection)
-
-  (doric-themes-select 'doric-marble)
-
-  (set-face-attribute 'default nil :family "Menlo" :height 120)
-  ;; (set-face-attribute 'variable-pitch nil :family "Aporetic Sans" :height 1.0)
-  ;; (set-face-attribute 'fixed-pitch nil :family "Aporetic Sans Mono" :height 1.0)
-
-  :bind
-  (("<f5>" . doric-themes-toggle)
-   ("C-<f5>" . doric-themes-select)
-   ("M-<f5>" . doric-themes-rotate)))
-
-(jao-when-linux (jao-themes-setup))
-
+(jao-themes-setup)
 
 ;;; Help system
 ;;;; help buffers