From b9f45c7e9e2241ea593807bfe8249151cc9034c0 Mon Sep 17 00:00:00 2001 From: Inhji Date: Thu, 1 Feb 2024 15:50:30 +0100 Subject: [PATCH] doom: turn config.el into config.org --- config/dot_config/doom/config.el | 102 ++++++------------------------ config/dot_config/doom/config.org | 65 +++++++++++++++++++ 2 files changed, 86 insertions(+), 81 deletions(-) create mode 100644 config/dot_config/doom/config.org diff --git a/config/dot_config/doom/config.el b/config/dot_config/doom/config.el index f8fa422..e60597e 100644 --- a/config/dot_config/doom/config.el +++ b/config/dot_config/doom/config.el @@ -1,37 +1,9 @@ ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- -;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! - -;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. It is optional. (setq user-full-name "Jonathan Jenne" user-mail-address "johnnie@posteo.de") -;; Doom exposes five (optional) variables for controlling fonts in Doom: -;; -;; - `doom-font' -- the primary font to use -;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) -;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. -;; - `doom-symbol-font' -- for symbols -;; - `doom-serif-font' -- for the `fixed-pitch-serif' face -;; -;; See 'C-h v doom-font' for documentation and more examples of what they -;; accept. For example: -;; -;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) -;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) -;; -;; If you or Emacs can't find your font, use 'M-x describe-font' to look them -;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to -;; refresh your font settings. If Emacs still can't find your font, it likely -;; wasn't installed correctly. Font issues are rarely Doom issues! - -;; 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: -(setq doom-theme 'doom-tokyo-night) +(setq doom-theme 'doom-one) ;; 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'. @@ -41,28 +13,24 @@ ;; change `org-directory'. It must be set before org loads! (setq org-directory "~/Notes/Org") -;; Hide empty days in agenda -(setq org-agenda-show-all-dates nil - org-agenda-span 2 - org-agenda-start-day "+0d" - org-agenda-time-grid - '((daily today require-timed) - (800 1000 1200 1400 1600 1800 2000) - " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄") - org-agenda-current-time-string - "◀── now ─────────────────────────────────────────────────" - org-agenda-block-separator ?─ - ;; Consider all org files part of the org-agenda - org-agenda-files (list "~/Notes/Org")) +(after! org (setq +org-capture-notes-file "Notes.org" + +org-capture-todo-file "Todo.org")) -;; Custom Agenda Commands -(setq org-agenda-custom-commands - '(("v" "A better agenda View" - ( - (agenda "" - ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) - (org-agenda-overriding-header "Agenda, unfinished"))) - )))) +;; Configure Org-Agenda +(after! org (setq + org-agenda-show-all-dates nil + org-agenda-span 2 + org-agenda-start-day "+0d" + org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done) + org-agenda-time-grid + '((daily today require-timed) + (800 1000 1200 1400 1600 1800 2000) + " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄") + org-agenda-current-time-string + "◀── now ──────────────────────────────────────────────── \\o/" + org-agenda-block-separator ?─ + ;; Consider all org files part of the org-agenda + org-agenda-files (list "~/Notes/Org"))) ;; Set bash as the default shell to run Emacs in since fish can cause problems (setq shell-file-name (executable-find "bash")) @@ -71,34 +39,6 @@ (add-hook 'org-mode-hook #'org-modern-mode) (add-hook 'org-agenda-finalize-hook #'org-modern-agenda) -;; Whenever you reconfigure a package, make sure to wrap your config in an -;; `after!' block, otherwise Doom's defaults may override your settings. E.g. -;; -;; (after! PACKAGE -;; (setq x y)) -;; -;; The exceptions to this rule: -;; -;; - Setting file/directory variables (like `org-directory') -;; - Setting variables which explicitly tell you to set them before their -;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). -;; - Setting doom variables (which start with 'doom-' or '+'). -;; -;; Here are some additional functions/macros that will help you configure Doom. -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package!' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). -;; This will open documentation for it, including demos of how they are used. -;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, -;; etc). -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. +(add-hook! org-mode :append + (lambda () (add-hook 'after-save-hook + #'org-babel-tangle :append :local))) diff --git a/config/dot_config/doom/config.org b/config/dot_config/doom/config.org new file mode 100644 index 0000000..b9e6f99 --- /dev/null +++ b/config/dot_config/doom/config.org @@ -0,0 +1,65 @@ +#+TITLE: Literate Doom Emacs Config +#+AUTHOR: Inhji +#+PROPERTY: header-args :tangle config.el + +Place your private configuration here! Remember, you do not need to run 'doom sync' after modifying this file! + +* Base Setup + +#+begin_src emacs-lisp +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- +#+end_src + +#+begin_src emacs-lisp +(setq user-full-name "Jonathan Jenne" + user-mail-address "johnnie@posteo.de") +#+end_src + +* Appearance + +#+begin_src emacs-lisp +(setq doom-theme 'doom-one) +#+end_src + +* Misc + +#+begin_src emacs-lisp +;; 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'. +(setq display-line-numbers-type t) + +;; 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 "~/Notes/Org") + +(after! org (setq +org-capture-notes-file "Notes.org" + +org-capture-todo-file "Todo.org")) + +;; Configure Org-Agenda +(after! org (setq + org-agenda-show-all-dates nil + org-agenda-span 2 + org-agenda-start-day "+0d" + org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done) + org-agenda-time-grid + '((daily today require-timed) + (800 1000 1200 1400 1600 1800 2000) + " ┄┄┄┄┄ " "┄┄┄┄┄┄┄┄┄┄┄┄┄┄┄") + org-agenda-current-time-string + "◀── now ──────────────────────────────────────────────── \\o/" + org-agenda-block-separator ?─ + ;; Consider all org files part of the org-agenda + org-agenda-files (list "~/Notes/Org"))) + +;; Set bash as the default shell to run Emacs in since fish can cause problems +(setq shell-file-name (executable-find "bash")) + +;; Initialize org-modern +(add-hook 'org-mode-hook #'org-modern-mode) +(add-hook 'org-agenda-finalize-hook #'org-modern-agenda) + +(add-hook! org-mode :append + (lambda () (add-hook 'after-save-hook + #'org-babel-tangle :append :local))) + +#+end_src