From 514b3abfc33eb6b0e2eecec5fe6cae35ac1dbbcd Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Wed, 24 Nov 2021 09:00:47 -0500 Subject: update setup code --- emacs/.doom.d/config.el | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) (limited to 'emacs/.doom.d/config.el') diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 4b106db..355a2ed 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -8,27 +8,29 @@ (setq user-full-name "KJ Orbekk" user-mail-address "kj@orbekk.com") -;; Doom exposes five (optional) variables for controlling fonts in Doom. Here -;; are the three important ones: -;; -;; + `doom-font' -;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; -;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd -;; font string. You generally only need these two: -(setq doom-font (font-spec :family "iosevka" :size 14)) -(setq doom-variable-pitch-font (font-spec :family "Noto Serif" :size 16)) - -;; There are two ways to load a theme. Both assume the theme is installed and -;; available. You can either set `doom-theme' or manually load a theme with the -;; `load-theme' function. This is the default: +(defmacro system-specific-config (system-regex &rest code) + "Run CODE on systems that match SYSTEM-REGEX." + `(when (string-match ,system-regex (system-name)) + ,@code)) + +(setq kj/font-size 14) (setq doom-theme 'doom-dark+) -(when (equal "pincer" (system-name)) - (setq doom-theme 'doom-one-light)) -(when (equal "orbekk" (system-name)) - (setq doom-theme 'doom-acario-light)) + +(system-specific-config + "pincer" + (setq doom-theme 'doom-one-light)) + +(system-specific-config + "orbekk" + (setq doom-theme 'doom-acario-light)) + +(system-specific-config + "^zot\." + (setq kj/font-size 18) + (setq doom-theme 'doom-acario-light)) + +(setq doom-font (font-spec :family "iosevka" :size kj/font-size)) +(setq doom-variable-pitch-font (font-spec :family "Noto Serif" :size kj/font-size)) ;; If you use `org' and don't want your org files in the default location below, ;; change `org-directory'. It must be set before org loads! @@ -156,4 +158,6 @@ (map! (:after evil-org :leader "n P" #'kj/org-publish)) -(load-file "~/.doom.d/config.local.el") +(let ((local-config "~/.doom.d/config.local.el")) + (when (file-exists-p local-config) + (load-file local-config))) -- cgit v1.2.3 From 5b61ad58ce2b09c298db7364cf16f2725575598b Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Thu, 2 Dec 2021 17:49:40 -0500 Subject: update --- emacs/.doom.d/config.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'emacs/.doom.d/config.el') diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 355a2ed..b2b8eca 100644 --- a/emacs/.doom.d/config.el +++ b/emacs/.doom.d/config.el @@ -26,7 +26,7 @@ (system-specific-config "^zot\." - (setq kj/font-size 18) + (setq kj/font-size 20) (setq doom-theme 'doom-acario-light)) (setq doom-font (font-spec :family "iosevka" :size kj/font-size)) -- cgit v1.2.3