diff options
| author | Jacob Janzen <jjanzenn@proton.me> | 2024-08-11 12:28:22 -0500 |
|---|---|---|
| committer | Jacob Janzen <jjanzenn@proton.me> | 2024-08-11 12:28:22 -0500 |
| commit | 45f3746ff609ffafd2f643bdb49cd901a27fa05f (patch) | |
| tree | 5954f0c8d1d5d70ecaeb227a13e2f56f3ad9e655 /common | |
| parent | 941d88de6de507f4d36c4dd6fd07dfd55395d2d8 (diff) | |
fix fonts on gentoo; quiet grep on gentoo
Diffstat (limited to 'common')
| -rw-r--r-- | common/.config/emacs/tools.org | 4 | ||||
| -rw-r--r-- | common/.config/emacs/user-interface.org | 20 | ||||
| -rw-r--r-- | common/zshrc.org | 2 |
3 files changed, 18 insertions, 8 deletions
diff --git a/common/.config/emacs/tools.org b/common/.config/emacs/tools.org index 488378e..ddbf80c 100644 --- a/common/.config/emacs/tools.org +++ b/common/.config/emacs/tools.org @@ -98,8 +98,8 @@ Set up fonts. Don't use =monospace= by default. Do use it where necessary though #+begin_src emacs-lisp :tangle ~/.config/emacs/tools.el :mkdirp yes (add-hook 'org-mode-hook 'variable-pitch-mode) (custom-set-faces - '(variable-pitch ((t :font "CMU Serif-18:weight=thin"))) - '(fixed-pitch ((t :font "SauceCodePro Nerd Font-14:weight=regular"))) + `(variable-pitch ((t :font ,jj/var-font))) + `(fixed-pitch ((t :font ,jj/mono-font))) '(org-block ((t (:inherit fixed-pitch)))) '(org-code ((t (:inherit (shadow fixed-pitch))))) '(org-document-info-keyword ((t (:inherit (shadow fixed-pitch))))) diff --git a/common/.config/emacs/user-interface.org b/common/.config/emacs/user-interface.org index 77ae0e2..ff4bd34 100644 --- a/common/.config/emacs/user-interface.org +++ b/common/.config/emacs/user-interface.org @@ -1,13 +1,23 @@ #+title: Emacs User Interface * Theming -Set the default font to the Source Code Pro nerd font variant. I use size 14 font. -#+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes +Set up Source Code Pro with Nerd Font patches as default font and Computer Modern as a variable pitch font. +#+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes + (defvar jj/mono-font) + (defvar jj/var-font) + (pcase system-type + (`gnu/linux + (when (eq (system-name) "gentoo")) + (setq jj/mono-font "SauceCodePro Nerd Font-11") + (setq jj/var-font "CMU Serif-14")) + (`darwin + (setq jj/mono-font "SauceCodePro Nerd Font-14:weight=thin") + (setq jj/var-font "CMU Serif-18"))) (add-to-list 'default-frame-alist - '(font . "SauceCodePro Nerd Font-14")) + `(font . ,jj/mono-font)) #+end_src -Use the Doom Nord light theme. +Use my custom Doom Disco light theme. #+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes (use-package doom-themes :straight (doom-themes :type git :host github :repo "doomemacs/themes" @@ -28,7 +38,7 @@ Use =doom-modeline= for a nicer modeline. :init (doom-modeline-mode 1)) #+end_src -Remove the titlebar. +Remove the title bar. #+begin_src emacs-lisp :tangle ~/.config/emacs/user-interface.el :mkdirp yes (add-to-list 'default-frame-alist '(undecorated . t)) #+end_src diff --git a/common/zshrc.org b/common/zshrc.org index 4ff5524..bbc2c0e 100644 --- a/common/zshrc.org +++ b/common/zshrc.org @@ -11,7 +11,7 @@ Set up completions. Enable Gentoo completions on my Gentoo system. #+begin_src sh :tangle ~/.zshrc :mkdirp yes - if [ "$(uname)" = 'Linux' ] && grep 'ID=gentoo' /etc/os-release; then + if [ "$(uname)" = 'Linux' ] && grep -q 'ID=gentoo' /etc/os-release; then prompt gentoo fi #+end_src |