diff options
Diffstat (limited to 'emacs/.doom.d')
-rw-r--r-- | emacs/.doom.d/config.el | 46 | ||||
-rw-r--r-- | emacs/.doom.d/init.el | 12 | ||||
-rw-r--r-- | emacs/.doom.d/packages.el | 4 |
3 files changed, 35 insertions, 27 deletions
diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el index 3d65f95..d88df3c 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 20) + (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! @@ -158,4 +160,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..65390f7 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 @@ -50,7 +52,7 @@ (window-select +numbers) ; visually switch windows workspaces ; tab emulation, persistence & separate workspaces zen ; distraction-free coding or writing - (emoji +unicode) ; 😇 + ;; (emoji +unicode) ; 😇 :editor (evil +everywhere); come to the dark side, we have cookies @@ -80,7 +82,7 @@ vterm ; the best terminal emulation in Emacs :checkers - syntax ; tasing you for every semicolon you forget + ;;syntax ; tasing you for every semicolon you forget ;;spell ; tasing you for misspelling mispelling ;;grammar ; tasing grammar mistake every you make @@ -94,7 +96,7 @@ (eval +overlay) ; run code, run (also, repls) ;;gist ; interacting with github gists lookup ; navigate your code and its documentation - ;;lsp + (lsp +eglot) ;;macos ; MacOS-specific commands magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs @@ -109,7 +111,7 @@ :lang ;;agda ; types of types of types of types... - cc ; C/C++/Obj-C madness + (cc +lsp) ; C/C++/Obj-C madness clojure ; java with a lisp ;;common-lisp ; if you've seen one lisp, you've seen them all ;;coq ; proofs-as-programs 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))) |