From 89172175cbfb63640d1ca8470f8c9355639d8fc9 Mon Sep 17 00:00:00 2001 From: Raul Benencia Date: Mon, 10 May 2021 07:55:31 -0700 Subject: Load fonts after theme --- .emacs.local.d/general.el | 23 ----------------------- .emacs.local.d/modes/themes.el | 24 ++++++++++++++++++++---- 2 files changed, 20 insertions(+), 27 deletions(-) diff --git a/.emacs.local.d/general.el b/.emacs.local.d/general.el index 4bd4992..b02440a 100644 --- a/.emacs.local.d/general.el +++ b/.emacs.local.d/general.el @@ -4,9 +4,6 @@ (eval-when-compile (require 'use-package)) -(add-to-list 'default-frame-alist - '(font . "Hack-12")) - (add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t) @@ -167,23 +164,3 @@ ;; Mutt support. (setq auto-mode-alist (append '((".*tmp/mutt.*" . mail-mode)) auto-mode-alist)) (setq auto-mode-alist (append '((".*tmp/neomutt.*" . mail-mode)) auto-mode-alist)) - -;; Fonts -;; Set the font face based on platform -(pcase system-type - ((or 'gnu/linux 'windows-nt 'cygwin) - (set-face-attribute 'default nil - :font "JetBrains Mono" - :weight 'light)) - ('darwin (set-face-attribute 'default nil :font "Fira Mono" :height 170))) - -;; Set the fixed pitch face -(set-face-attribute 'fixed-pitch nil - :font "JetBrains Mono" - :weight 'light) - -;; Set the variable pitch face -(set-face-attribute 'variable-pitch nil - ;; :font "Cantarell" - :font "JetBrains Mono" - :weight 'light) diff --git a/.emacs.local.d/modes/themes.el b/.emacs.local.d/modes/themes.el index 5e81cc9..ad7e376 100644 --- a/.emacs.local.d/modes/themes.el +++ b/.emacs.local.d/modes/themes.el @@ -1,7 +1,23 @@ -;; Debian packages: elpa-clues-theme elpa-monokai-theme elpa-smart-mode-line-powerline-theme elpa-solarized-theme elpa-zenburn-theme -;; Elpa packages: atom-one-dark doom-themes - -(load-theme 'clues t) +(load-theme 'zenburn t) (set-frame-parameter (selected-frame) 'alpha '(95 . 95)) (add-to-list 'default-frame-alist '(alpha . (95 . 95))) +;; Fonts +;; Set the font face based on platform +(pcase system-type + ((or 'gnu/linux 'windows-nt 'cygwin) + (set-face-attribute 'default nil + :font "JetBrains Mono" + :weight 'light)) + ('darwin (set-face-attribute 'default nil :font "Fira Mono" :height 200))) + +;; Set the fixed pitch face +(set-face-attribute 'fixed-pitch nil + :font "JetBrains Mono" + :weight 'light) + +;; Set the variable pitch face +(set-face-attribute 'variable-pitch nil + ;; :font "Cantarell" + :font "JetBrains Mono" + :weight 'light) -- cgit v1.2.3