diff options
| -rw-r--r-- | attic/elisp/misc.el | 26 | ||||
| -rw-r--r-- | init.el | 27 | ||||
| -rw-r--r-- | lib/themes/jao-light-theme.el | 4 |
3 files changed, 32 insertions, 25 deletions
diff --git a/attic/elisp/misc.el b/attic/elisp/misc.el index 3e12ec1..b43b3ae 100644 --- a/attic/elisp/misc.el +++ b/attic/elisp/misc.el @@ -1014,3 +1014,29 @@ (("n" . next-line) ("p" . previous-line) ("g" . jenkins-refresh-console-output)))) + +;;; doric themes +(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 "Triplicate T4c" :height 120) + ;; (set-face-attribute 'default nil :family "0xProto" :height 110) + ;; (set-face-attribute 'default nil :family "Rec Mono Casual" :height 120) + ;; (set-face-attribute 'default nil :family "Rec Mono Linear" :height 120) + ;; (set-face-attribute 'default nil :family "Rec Mono Duotone" :height 120) + ;; (set-face-attribute 'default nil :family "Victor Mono" :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))) @@ -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 diff --git a/lib/themes/jao-light-theme.el b/lib/themes/jao-light-theme.el index 659b6bb..30a56af 100644 --- a/lib/themes/jao-light-theme.el +++ b/lib/themes/jao-light-theme.el @@ -36,9 +36,9 @@ (green "#005555") (lightgreen "darkgreen") (yellow "lightyellow")) - (:face-size 9) + (:face-size (jao-d-l 12 9)) ;; (:face-family "DejaVu Sans Mono") - (:face-family "Hack") + (:face-family (jao-d-l "Triplicate T4c" "Hack")) (:bold-weight 'semibold) (:palette (fg "black") (bg "white") |