diff --git a/.emacs.d/include/general.el b/.emacs.d/include/general.el index fb450ef..bbaa8ab 100644 --- a/.emacs.d/include/general.el +++ b/.emacs.d/include/general.el @@ -52,26 +52,16 @@ (load-theme 'nano t) (nano-light) -(defvar priime-fixed-font nil) -(defvar priime-variable-font nil) -(defvar priime-font-size nil) -(defvar priime-fixed-height nil) +(defvar priime--font-config + (cond ((string= (system-name) "framework") '("Roboto Mono Medium" "Roboto" 10 0.8)) + ((eq system-type 'gnu/linux) '("Roboto Mono Medium" "Roboto" 10 0.8)) + ((eq system-type 'darwin) '("Menlo" "Verdana" 12 1)) + (t '("Roboto Mono" "Roboto" 10 0.8)))) -(cond ((eq system-type 'gnu/linux) - (setf priime-fixed-font "JetBrains Mono SemiBold") - (setf priime-variable-font "Roboto") - (setf priime-font-size 10) - (setf priime-fixed-height 0.8)) - ((eq system-type 'darwin) - (setf priime-fixed-font "Menlo") - (setf priime-variable-font "Verdana") - (setf priime-font-size 12) - (setf priime-fixed-height 1)) - (t - (setf priime-fixed-font "Roboto Mono") - (setf priime-variable-font "Roboto") - (setf priime-font-size 10) - (setf priime-fixed-height 0.8))) +(defvar priime-fixed-font (-first-item priime--font-config)) +(defvar priime-variable-font (-second-item priime--font-config)) +(defvar priime-font-size (-third-item priime--font-config)) +(defvar priime-fixed-height (-fourth-item priime--font-config)) (add-to-list 'default-frame-alist `(font . ,(format "%s-10" priime-fixed-font))) (set-frame-font (format "%s %d" priime-fixed-font priime-font-size))