From fbe3e2950557e157e6222f1bf96f59260f4689b9 Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Mon, 15 Nov 2021 09:03:22 +0100 Subject: [PATCH] More font config + reorder config + a bit more comments --- config.el | 58 ++++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/config.el b/config.el index 7396612..089eb60 100644 --- a/config.el +++ b/config.el @@ -8,29 +8,21 @@ (setq user-full-name "Maël MARTIN" user-mail-address "mael.martin@protonmail.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. -;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) +;; Set Doom fonts (setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'medium) doom-variable-pitch-font (font-spec :family "Fira Code" :size 12) doom-big-font (font-spec :family "Fira Code" :size 14)) +(after! doom-theme + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) +(custom-set-faces! + '(font-lock-comment-face :slant italic) + '(font-lock-keyword-face :slant italic)) -;; 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: +;; Set theme. Either `doom-theme' or `load-theme' (setq doom-theme 'doom-one) -;; 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! -(setq org-directory "~/org/") - -;; This determines the style of line numbers in effect. If set to `nil', line -;; numbers are disabled. For relative line numbers, set this to `relative'. +;; Line numbering: nil | relative | t (true) (setq display-line-numbers-type t) ;; Zoom key-bindings @@ -39,6 +31,22 @@ (global-set-key (kbd "<C-wheel-up>") 'text-scale-increase) (global-set-key (kbd "<C-wheel-down>") 'text-scale-decrease) +;; Things for the ORG mode +(add-hook 'org-mode-hook 'org-indent-mode) +(setq org-directory "~/org/" + org-agenda-files '("~/org/agenda.org") + org-default-notes-file (expand-file-name "notes.org" org-directory) + org-ellipsis " ▼ " + org-log-done 'time + org-journal-dir "~/org/journal/" + org-journal-date-format "%B %d, %Y (%A) " + org-journal-file-format "%Y-%m-%d.org" + org-hide-emphasis-markers t) +(setq org-src-preserve-indentation nil + org-src-tab-acts-natively t + org-edit-src-content-indentation 0) +(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) + ;; Here are some additional functions/macros that could help you configure Doom: ;; ;; - `load!' for loading external *.el files relative to this one @@ -55,19 +63,3 @@ ;; ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. - -;; Things for the ORG mode -(add-hook 'org-mode-hook 'org-indent-mode) -(setq org-directory "~/org/" - org-agenda-files '("~/org/agenda.org") - org-default-notes-file (expand-file-name "notes.org" org-directory) - org-ellipsis " ▼ " - org-log-done 'time - org-journal-dir "~/org/journal/" - org-journal-date-format "%B %d, %Y (%A) " - org-journal-file-format "%Y-%m-%d.org" - org-hide-emphasis-markers t) -(setq org-src-preserve-indentation nil - org-src-tab-acts-natively t - org-edit-src-content-indentation 0) -(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))) -- GitLab