From 242bb8d2b30026aca542339780407baaec8378a2 Mon Sep 17 00:00:00 2001 From: Derek Taylor Date: Sat, 2 Jul 2022 19:44:16 -0500 Subject: [PATCH] Minor edits to Doom config. --- .config/doom/config.el | 36 +++++++++++++------------- .config/doom/config.org | 56 ++++++++++++++++------------------------ .config/doom/init.el | 3 +-- .config/doom/packages.el | 6 ----- 4 files changed, 41 insertions(+), 60 deletions(-) diff --git a/.config/doom/config.el b/.config/doom/config.el index 426a12c..6578800 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -324,9 +324,12 @@ List of keybindings (SPC h b b)") (custom-set-faces '(markdown-header-face ((t (:inherit font-lock-function-name-face :weight bold :family "variable-pitch")))) - '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.8)))) - '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.4)))) - '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2))))) + '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.7)))) + '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.6)))) + '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.5)))) + '(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.4)))) + '(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.3)))) + '(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.2))))) (setq minimap-window-location 'right) (map! :leader @@ -392,7 +395,7 @@ List of keybindings (SPC h b b)") "DONE(d)" ; Task has been completed "CANCELLED(c)" )))) ; Task has been cancelled -(defun org-colors-doom-one () +(defun dt/org-colors-doom-one () "Enable Doom One colors for Org headers." (interactive) (dolist @@ -408,7 +411,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-dracula () +(defun dt/org-colors-dracula () "Enable Dracula colors for Org headers." (interactive) (dolist @@ -424,7 +427,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-gruvbox-dark () +(defun dt/org-colors-gruvbox-dark () "Enable Gruvbox Dark colors for Org headers." (interactive) (dolist @@ -440,7 +443,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-monokai-pro () +(defun dt/org-colors-monokai-pro () "Enable Monokai Pro colors for Org headers." (interactive) (dolist @@ -456,7 +459,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-nord () +(defun dt/org-colors-nord () "Enable Nord colors for Org headers." (interactive) (dolist @@ -472,7 +475,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-oceanic-next () +(defun dt/org-colors-oceanic-next () "Enable Oceanic Next colors for Org headers." (interactive) (dolist @@ -488,7 +491,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-palenight () +(defun dt/org-colors-palenight () "Enable Palenight colors for Org headers." (interactive) (dolist @@ -504,7 +507,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-solarized-dark () +(defun dt/org-colors-solarized-dark () "Enable Solarized Dark colors for Org headers." (interactive) (dolist @@ -520,7 +523,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-solarized-light () +(defun dt/org-colors-solarized-light () "Enable Solarized Light colors for Org headers." (interactive) (dolist @@ -536,7 +539,7 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-tomorrow-night () +(defun dt/org-colors-tomorrow-night () "Enable Tomorrow Night colors for Org headers." (interactive) (dolist @@ -552,8 +555,8 @@ List of keybindings (SPC h b b)") (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -;; Load our desired org-colors-* theme on startup -(org-colors-doom-one) +;; Load our desired dt/org-colors-* theme on startup +(dt/org-colors-doom-one) (use-package ox-man) (use-package ox-gemini) @@ -673,9 +676,6 @@ List of keybindings (SPC h b b)") :publishing-function org-publish-attachment) )) -(after! org-roam - (setq org-roam-directory "~/nc/Roam")) - (use-package! org-auto-tangle :defer t :hook (org-mode . org-auto-tangle-mode) diff --git a/.config/doom/config.org b/.config/doom/config.org index 3694063..d2878b6 100644 --- a/.config/doom/config.org +++ b/.config/doom/config.org @@ -46,7 +46,6 @@ - [[#org-export][Org-export]] - [[#org-journal][Org-journal]] - [[#org-publish][Org-publish]] - - [[#org-roam][Org-roam]] - [[#org-auto-tangle][Org-auto-tangle]] - [[#password-store][PASSWORD STORE]] - [[#perspective][PERSPECTIVE]] @@ -661,9 +660,12 @@ I set comment-line to 'SPC TAB TAB' which is a rather comfortable keybinding for #+begin_src emacs-lisp (custom-set-faces '(markdown-header-face ((t (:inherit font-lock-function-name-face :weight bold :family "variable-pitch")))) - '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.8)))) - '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.4)))) - '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2))))) + '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.7)))) + '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.6)))) + '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.5)))) + '(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.4)))) + '(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.3)))) + '(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.2))))) #+end_src @@ -783,10 +785,10 @@ I wrapped most of this block in (after! org). Without this, my settings might b #+END_SRC ** Org fonts -I have created an interactive function for each color scheme (M-x org-colors-*). These functions will set appropriate colors and font attributes for org-level fonts and the org-table font. +I have created an interactive function for each color scheme (M-x dt/org-colors-*). These functions will set appropriate colors and font attributes for org-level fonts and the org-table font. #+begin_src emacs-lisp -(defun org-colors-doom-one () +(defun dt/org-colors-doom-one () "Enable Doom One colors for Org headers." (interactive) (dolist @@ -802,7 +804,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-dracula () +(defun dt/org-colors-dracula () "Enable Dracula colors for Org headers." (interactive) (dolist @@ -818,7 +820,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-gruvbox-dark () +(defun dt/org-colors-gruvbox-dark () "Enable Gruvbox Dark colors for Org headers." (interactive) (dolist @@ -834,7 +836,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-monokai-pro () +(defun dt/org-colors-monokai-pro () "Enable Monokai Pro colors for Org headers." (interactive) (dolist @@ -850,7 +852,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-nord () +(defun dt/org-colors-nord () "Enable Nord colors for Org headers." (interactive) (dolist @@ -866,7 +868,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-oceanic-next () +(defun dt/org-colors-oceanic-next () "Enable Oceanic Next colors for Org headers." (interactive) (dolist @@ -882,7 +884,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-palenight () +(defun dt/org-colors-palenight () "Enable Palenight colors for Org headers." (interactive) (dolist @@ -898,7 +900,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-solarized-dark () +(defun dt/org-colors-solarized-dark () "Enable Solarized Dark colors for Org headers." (interactive) (dolist @@ -914,7 +916,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-solarized-light () +(defun dt/org-colors-solarized-light () "Enable Solarized Light colors for Org headers." (interactive) (dolist @@ -930,7 +932,7 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -(defun org-colors-tomorrow-night () +(defun dt/org-colors-tomorrow-night () "Enable Tomorrow Night colors for Org headers." (interactive) (dolist @@ -946,15 +948,15 @@ I have created an interactive function for each color scheme (M-x org-colors-*). (set-face-attribute (nth 0 face) nil :font doom-variable-pitch-font :weight (nth 3 face) :height (nth 1 face) :foreground (nth 2 face))) (set-face-attribute 'org-table nil :font doom-font :weight 'normal :height 1.0 :foreground "#bfafdf")) -;; Load our desired org-colors-* theme on startup -(org-colors-doom-one) +;; Load our desired dt/org-colors-* theme on startup +(dt/org-colors-doom-one) #+end_src ** Org-export We need ox-man for "Org eXporting" to manpage format and ox-gemini for exporting to gemtext (for the gemini protocol). -=NOTE:= I also enable ox-publish for converting an Org site into an HTML site, but that is done in init.el (org +publish). +=NOTE=: I also enable ox-publish for converting an Org site into an HTML site, but that is done in init.el (org +publish). #+BEGIN_SRC emacs-lisp (use-package ox-man) @@ -1082,23 +1084,8 @@ We need ox-man for "Org eXporting" to manpage format and ox-gemini for exporting )) #+end_src -** Org-roam -| COMMAND | DESCRIPTION | KEYBINDING | -|---------------------------------+---------------------------------+-------------| -| org-roam-find-file | org roam find file | SPC n r f | -| org-roam-insert | org roam insert | SPC n r i | -| org-roam-dailies-find-date | org roam dailies find date | SPC n r d d | -| org-roam-dailies-find-today | org roam dailies find today | SPC n r d t | -| org-roam-dailies-find-tomorrow | org roam dailies find tomorrow | SPC n r d m | -| org-roam-dailies-find-yesterday | org roam dailies find yesterday | SPC n r d y | - -#+begin_src emacs-lisp -(after! org-roam - (setq org-roam-directory "~/nc/Roam")) - -#+end_src - ** Org-auto-tangle +=org-auto-tangle= allows you to add the option =#+auto_tangle: t= in your Org file so that it automatically tangles when you save the document. #+begin_src emacs-lisp (use-package! org-auto-tangle @@ -1106,6 +1093,7 @@ We need ox-man for "Org eXporting" to manpage format and ox-gemini for exporting :hook (org-mode . org-auto-tangle-mode) :config (setq org-auto-tangle-default t)) + #+end_src * PASSWORD STORE diff --git a/.config/doom/init.el b/.config/doom/init.el index 84d6d21..02ce1d1 100644 --- a/.config/doom/init.el +++ b/.config/doom/init.el @@ -149,8 +149,7 @@ (org +journal ; enable org journal +pretty ; replace asterisks with pretty org bullets - +publish ; create static websites with org - +roam2) ; org roam v2 + +publish) ; create static websites with org php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional diff --git a/.config/doom/packages.el b/.config/doom/packages.el index 58f43db..867cafd 100644 --- a/.config/doom/packages.el +++ b/.config/doom/packages.el @@ -56,30 +56,24 @@ ;; :recipe (:host github :repo "magit/git-modes" ;; :files ("gitignore-mode.el"))) (package! flycheck-aspell) -(package! async) (package! calfw) (package! calfw-org) -(package! dash) (package! dashboard) (package! dired-open) (package! dired-subtree) (package! dmenu) (package! elfeed-goodies) (package! emojify) -(package! esxml) (package! evil-tutor) (package! ivy-posframe) (package! mw-thesaurus) (package! org-auto-tangle) -(package! org-board) (package! org-web-tools) (package! ox-gemini) (package! peep-dired) (package! password-store) (package! rainbow-mode) -(package! request) (package! resize-window) -(package! s) (package! tldr) (package! wc-mode) (package! beacon)