diff --git a/config/dot_config/doom/config.el b/config/dot_config/doom/config.el index de8b09b..b568465 100644 --- a/config/dot_config/doom/config.el +++ b/config/dot_config/doom/config.el @@ -1,9 +1,5 @@ ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- -(map! :n "" #'org-agenda-list) -(map! "C-M-+" #'doom/increase-font-size) -(map! "C-#" #'comment-line) - ;; Basic User Settings (setq user-full-name "Jonathan Jenne" user-mail-address "johnnie@posteo.de") @@ -15,30 +11,41 @@ ;; Display Line numbers (setq display-line-numbers-type t) -;; Set Emacs theme -;;(setq doom-theme 'gruvbox) +;; General Keybindings +(map! :n "" #'org-agenda-list) +(map! "C-M-+" #'doom/increase-font-size) +(map! "C-#" #'comment-line) +(evil-define-key 'normal dired-mode-map + (kbd "DEL") 'dired-up-directory) -;; Hooks +(use-package! heaven-and-hell + :ensure t + :config + (setq heaven-and-hell-theme-type 'dark) ;; Omit to use light by default + (setq heaven-and-hell-themes + '((light . doom-feather-light) + (dark . doom-feather-dark))) ;; Themes can be the list: (dark . (tsdh-dark wombat)) + ;; Optionall, load themes without asking for confirmation. + (setq heaven-and-hell-load-theme-no-confirm t) + :hook (after-init . heaven-and-hell-init-hook) + :bind (("C-c " . heaven-and-hell-load-default-theme) + ("" . heaven-and-hell-toggle-theme))) + +;; Org Mode (add-hook 'org-mode-hook #'org-modern-mode) -(add-hook 'org-agenda-finalize-hook #'org-modern-agenda) +(add-hook 'org-mode-hook #'hl-todo-mode) -(setq hl-todo-keyword-faces '(("TODO" warning bold) - ("FIXME" error bold) - ("EXAMPLE" font-lock-keyword-face bold) - ("HACK" font-lock-constant-face bold) - ("DEPRECATED" font-lock-doc-face bold) - ("NOTE" success bold) - ("BUG" error bold) - ("XXX" font-lock-constant-face bold))) +;; Org Agenda +(add-hook 'org-agenda-finalize-hook #'org-modern-agenda) (setq +user-org-path "~/Notes/Org") (defun org-path (filename) (expand-file-name filename +user-org-path)) -(add-to-list 'org-modules 'org-habit) - (after! org (setq org-directory +user-org-path org-src-tab-acts-natively t)) +(add-to-list 'org-modules 'org-habit) + (after! org (setq +org-capture-notes-file (org-path "Notes.org") +org-capture-todo-file (org-path "Todo.org") +org-capture-journal-file (org-path "Journal.org") @@ -78,11 +85,16 @@ ;; Consider all org files part of the org-agenda org-agenda-files (list +user-org-path))) -(setq org-auto-tangle-default nil) +(after! hl-todo (setq hl-todo-keyword-faces '(("TODO" warning bold) + ("FIXME" error bold) + ("EXAMPLE" font-lock-keyword-face bold) + ("HACK" font-lock-constant-face bold) + ("DEPRECATED" font-lock-doc-face bold) + ("NOTE" success bold) + ("BUG" error bold) + ("XXX" font-lock-constant-face bold)))) (use-package! org-auto-tangle :defer t + :config (setq org-auto-tangle-default nil) :hook (org-mode . org-auto-tangle-mode)) - -(evil-define-key 'normal dired-mode-map - (kbd "DEL") 'dired-up-directory) diff --git a/config/dot_config/doom/config.org b/config/dot_config/doom/config.org index f1b4416..5afd04c 100644 --- a/config/dot_config/doom/config.org +++ b/config/dot_config/doom/config.org @@ -3,13 +3,35 @@ #+PROPERTY: header-args :tangle config.el #+auto_tangle: t +* Table of Contents :toc: +- [[#keybindings][Keybindings]] +- [[#base-config][Base Config]] +- [[#themes][Themes]] +- [[#org-mode][Org Mode]] + - [[#hooks][Hooks]] + - [[#general-settings][General Settings]] + - [[#org-capture][Org Capture]] + - [[#org-agenda][Org Agenda]] +- [[#packages][Packages]] + - [[#hl-todo][hl-todo]] + - [[#org-auto-tangle][org-auto-tangle]] + +* Keybindings + +| Key | Description | State | +|------------+-------------------------+-------| +| F12 | Show Org-Agenda | N | +| Ctrl-Alt-+ | Increase Font Size | | +| Ctrl-# | Toggle Line Comment | | +| F6 | Toggle Light/Dark Theme | | +| Ctrl-c F6 | Load Default Theme | | +| DEL | Up Directory | Dired | + +* Base Config + #+begin_src emacs-lisp ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- -(map! :n "" #'org-agenda-list) -(map! "C-M-+" #'doom/increase-font-size) -(map! "C-#" #'comment-line) - ;; Basic User Settings (setq user-full-name "Jonathan Jenne" user-mail-address "johnnie@posteo.de") @@ -21,30 +43,53 @@ ;; Display Line numbers (setq display-line-numbers-type t) -;; Set Emacs theme -;;(setq doom-theme 'gruvbox) +;; General Keybindings +(map! :n "" #'org-agenda-list) +(map! "C-M-+" #'doom/increase-font-size) +(map! "C-#" #'comment-line) +(evil-define-key 'normal dired-mode-map + (kbd "DEL") 'dired-up-directory) +#+end_src -;; Hooks +* Themes + +#+begin_src emacs-lisp +(use-package! heaven-and-hell + :ensure t + :config + (setq heaven-and-hell-theme-type 'dark) ;; Omit to use light by default + (setq heaven-and-hell-themes + '((light . doom-feather-light) + (dark . doom-feather-dark))) ;; Themes can be the list: (dark . (tsdh-dark wombat)) + ;; Optionall, load themes without asking for confirmation. + (setq heaven-and-hell-load-theme-no-confirm t) + :hook (after-init . heaven-and-hell-init-hook) + :bind (("C-c " . heaven-and-hell-load-default-theme) + ("" . heaven-and-hell-toggle-theme))) +#+end_src + +* Org Mode +** Hooks +#+begin_src emacs-lisp +;; Org Mode (add-hook 'org-mode-hook #'org-modern-mode) +(add-hook 'org-mode-hook #'hl-todo-mode) + +;; Org Agenda (add-hook 'org-agenda-finalize-hook #'org-modern-agenda) - -(setq hl-todo-keyword-faces '(("TODO" warning bold) - ("FIXME" error bold) - ("EXAMPLE" font-lock-keyword-face bold) - ("HACK" font-lock-constant-face bold) - ("DEPRECATED" font-lock-doc-face bold) - ("NOTE" success bold) - ("BUG" error bold) - ("XXX" font-lock-constant-face bold))) - +#+end_src +** General Settings +#+begin_src emacs-lisp (setq +user-org-path "~/Notes/Org") (defun org-path (filename) (expand-file-name filename +user-org-path)) -(add-to-list 'org-modules 'org-habit) - (after! org (setq org-directory +user-org-path org-src-tab-acts-natively t)) +(add-to-list 'org-modules 'org-habit) +#+end_src +** Org Capture +#+begin_src emacs-lisp (after! org (setq +org-capture-notes-file (org-path "Notes.org") +org-capture-todo-file (org-path "Todo.org") +org-capture-journal-file (org-path "Journal.org") @@ -68,7 +113,9 @@ ("jj" "Journal" entry (file+olp+datetree +org-capture-journal-file) "* %U %?\n" :prepend t)))) - +#+end_src +** Org Agenda +#+begin_src emacs-lisp (after! org (setq org-agenda-show-all-dates nil org-agenda-span 4 @@ -83,13 +130,23 @@ org-agenda-block-separator ?─ ;; Consider all org files part of the org-agenda org-agenda-files (list +user-org-path))) - -(setq org-auto-tangle-default nil) - +#+end_src +* Packages +** hl-todo +#+begin_src emacs-lisp +(after! hl-todo (setq hl-todo-keyword-faces '(("TODO" warning bold) + ("FIXME" error bold) + ("EXAMPLE" font-lock-keyword-face bold) + ("HACK" font-lock-constant-face bold) + ("DEPRECATED" font-lock-doc-face bold) + ("NOTE" success bold) + ("BUG" error bold) + ("XXX" font-lock-constant-face bold)))) +#+end_src +** org-auto-tangle +#+begin_src emacs-lisp (use-package! org-auto-tangle :defer t + :config (setq org-auto-tangle-default nil) :hook (org-mode . org-auto-tangle-mode)) - -(evil-define-key 'normal dired-mode-map - (kbd "DEL") 'dired-up-directory) #+end_src