summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'emacs')
-rw-r--r--emacs/.doom.d/config.el46
-rw-r--r--emacs/.doom.d/init.el4
-rw-r--r--emacs/.doom.d/packages.el4
3 files changed, 31 insertions, 23 deletions
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)))
diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el
index 4c04ad3..e2ea82f 100644
--- a/emacs/.doom.d/init.el
+++ b/emacs/.doom.d/init.el
@@ -13,7 +13,9 @@
;;
;; Alternatively, press 'gd' (or 'C-c g d') on a module to browse its
;; directory (for easy access to its source code).
-(load-file "~/.doom.d/init.local.el")
+(let ((local-config "~/.doom.d/init.local.el"))
+ (when (file-exists-p local-config)
+ (load-file local-config)))
(doom! :input
;;chinese
diff --git a/emacs/.doom.d/packages.el b/emacs/.doom.d/packages.el
index 95c7e51..666cb66 100644
--- a/emacs/.doom.d/packages.el
+++ b/emacs/.doom.d/packages.el
@@ -48,4 +48,6 @@
;; (package! hledger-mode)
-(load-file "~/.doom.d/packages.local.el")
+(let ((local-config "~/.doom.d/packages.local.el"))
+ (when (file-exists-p local-config)
+ (load-file local-config)))