diff --git a/config/dot_config/doom/config.el b/config/dot_config/doom/config.el index 6260a75..f6cb7dd 100644 --- a/config/dot_config/doom/config.el +++ b/config/dot_config/doom/config.el @@ -1,5 +1,12 @@ ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- +(map! :n "" #'org-agenda-list) +(map! :n "" #'org-drill) +(map! "C-M-+" #'doom/increase-font-size) +(map! "C-#" #'comment-line) +(evil-define-key 'normal dired-mode-map + (kbd "DEL") 'dired-up-directory) + ;; Basic User Settings (setq user-full-name "Jonathan Jenne" user-mail-address "johnnie@posteo.de") @@ -11,25 +18,6 @@ ;; Display Line numbers (setq display-line-numbers-type t) -;; General Keybindings -(map! :n "" #'org-agenda-list) -(map! :n "" #'org-drill) -(map! "C-M-+" #'doom/increase-font-size) -(map! "C-#" #'comment-line) -(evil-define-key 'normal dired-mode-map - (kbd "DEL") 'dired-up-directory) - -;; 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) - -;; Modeline -(add-hook 'doom-after-init-hook #'display-battery-mode) -(add-hook 'doom-after-init-hook #'display-time-mode) - (use-package! heaven-and-hell :ensure t :config @@ -77,6 +65,7 @@ (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") + +org-capture-cooking-file (org-path "Cooking.org") +org-capture-nepali-file (org-path "Nepali.org"))) (after! org (setq org-capture-templates @@ -84,6 +73,28 @@ (file+headline +org-capture-todo-file "Inbox") "* TODO %?\n" :prepend t) + ("r" "Recipe" entry + (file+headline +org-capture-cooking-file "Unsorted") + "* NEVERMADE %? +:PROPERTIES: +:Author: +:Source: +:Sent_by: +:Yield: +:Prep_Time: +:Cook_Time: +:Total_Time: +:Cost: +:Description: +:URL: +:Added: %u +:END: + +- [ ] Ingredient 1 + + +1. First Step") + ("n" "Nepali") ("nw" "Nepali Word" entry @@ -115,6 +126,8 @@ ;; Consider all org files part of the org-agenda org-agenda-files (list +user-org-path))) +(add-hook 'org-mode-hook #'hl-todo-mode) + (after! hl-todo (setq hl-todo-keyword-faces '(("TODO" warning bold) ("FIXME" error bold) ("EXAMPLE" font-lock-keyword-face bold) @@ -136,4 +149,7 @@ (setq doom-modeline-battery t) (setq doom-modeline-major-mode-icon t)) +(add-hook 'doom-after-init-hook #'display-battery-mode) +(add-hook 'doom-after-init-hook #'display-time-mode) + (after! evil-snipe (setq evil-snipe-scope 'whole-visible)) diff --git a/config/dot_config/doom/config.org b/config/dot_config/doom/config.org index 3b1b9bc..b07508b 100644 --- a/config/dot_config/doom/config.org +++ b/config/dot_config/doom/config.org @@ -3,10 +3,15 @@ #+PROPERTY: header-args :tangle config.el #+auto_tangle: t +* Header +#+begin_src emacs-lisp +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- +#+end_src + * Table of Contents :toc: +- [[#header][Header]] - [[#keybindings][Keybindings]] - [[#base-config][Base Config]] - - [[#hooks][Hooks]] - [[#themes][Themes]] - [[#org-mode][Org Mode]] - [[#general-settings][General Settings]] @@ -33,10 +38,18 @@ These keybindings extend the default doom bindings, either because the defaults | F6 | Toggle Light/Dark Theme | | | F7 | Start Org-Drill | | +#+begin_src emacs-lisp +(map! :n "" #'org-agenda-list) +(map! :n "" #'org-drill) +(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 + * Base Config #+begin_src emacs-lisp -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- ;; Basic User Settings (setq user-full-name "Jonathan Jenne" @@ -48,29 +61,8 @@ These keybindings extend the default doom bindings, either because the defaults ;; Display Line numbers (setq display-line-numbers-type t) - -;; General Keybindings -(map! :n "" #'org-agenda-list) -(map! :n "" #'org-drill) -(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 -#+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) - -;; Modeline -(add-hook 'doom-after-init-hook #'display-battery-mode) -(add-hook 'doom-after-init-hook #'display-time-mode) -#+end_src * Themes #+begin_src emacs-lisp @@ -135,6 +127,7 @@ These keybindings extend the default doom bindings, either because the defaults (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") + +org-capture-cooking-file (org-path "Cooking.org") +org-capture-nepali-file (org-path "Nepali.org"))) (after! org (setq org-capture-templates @@ -142,6 +135,28 @@ These keybindings extend the default doom bindings, either because the defaults (file+headline +org-capture-todo-file "Inbox") "* TODO %?\n" :prepend t) + ("r" "Recipe" entry + (file+headline +org-capture-cooking-file "Unsorted") + "* NEVERMADE %? +:PROPERTIES: +:Author: +:Source: +:Sent_by: +:Yield: +:Prep_Time: +:Cook_Time: +:Total_Time: +:Cost: +:Description: +:URL: +:Added: %u +:END: + +- [ ] Ingredient 1 + + +1. First Step") + ("n" "Nepali") ("nw" "Nepali Word" entry @@ -179,6 +194,8 @@ These keybindings extend the default doom bindings, either because the defaults * Packages ** hl-todo #+begin_src emacs-lisp +(add-hook 'org-mode-hook #'hl-todo-mode) + (after! hl-todo (setq hl-todo-keyword-faces '(("TODO" warning bold) ("FIXME" error bold) ("EXAMPLE" font-lock-keyword-face bold) @@ -206,6 +223,9 @@ These keybindings extend the default doom bindings, either because the defaults (after! doom-modeline (setq doom-modeline-battery t) (setq doom-modeline-major-mode-icon t)) + +(add-hook 'doom-after-init-hook #'display-battery-mode) +(add-hook 'doom-after-init-hook #'display-time-mode) #+end_src ** evil-snipe #+begin_src emacs-lisp diff --git a/config/dot_config/doom/packages.el b/config/dot_config/doom/packages.el index 481a63d..949b14e 100644 --- a/config/dot_config/doom/packages.el +++ b/config/dot_config/doom/packages.el @@ -10,7 +10,6 @@ ;; To disable an installed package: ;; (package! some-package :disable t) -(package! org-modern) (package! org-auto-tangle) (package! org-habit-stats) (package! org-drill)