consolidate journal template targets

mess with modeline

config/dot_config/doom/config.el

@@ -18,6 +18,17 @@
 (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
@@ -31,13 +42,6 @@
   :bind (("C-c <f6>" . heaven-and-hell-load-default-theme)
          ("<f6>" . heaven-and-hell-toggle-theme)))
 
-;; 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 +user-org-path "~/Notes/Org")
 (defun org-path (filename) (expand-file-name filename +user-org-path))
 
@@ -62,12 +66,12 @@
 
                     ("j" "Journal entries")
 
-                    ("jt" "Travelling Journal" entry
-                     (file+headline +org-capture-travel-journal-file "Inbox")
-                     "* %u %?\n" :prepend t)
-
-                    ("jj" "Journal" entry
+                    ("jj" "Daily Journal" entry
                      (file+olp+datetree +org-capture-journal-file)
+                     "* %U %?\n" :prepend t)
+
+                    ("jt" "Travel Journal" entry
+                     (file+headline +org-capture-journal-file "Travel")
                      "* %U %?\n" :prepend t))))
 
 (after! org (setq
@@ -98,3 +102,8 @@
   :defer t
   :config (setq org-auto-tangle-default nil)
   :hook (org-mode . org-auto-tangle-mode))
+
+(after! doom-modeline
+  (setq doom-modeline-battery t)
+  (setq doom-modeline-time t)
+  (setq doom-modeline-major-mode-icon t))

config/dot_config/doom/config.org

@@ -6,15 +6,16 @@
 * Table of Contents :toc:
 - [[#keybindings][Keybindings]]
 - [[#base-config][Base Config]]
+  - [[#hooks][Hooks]]
 - [[#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]]
+  - [[#doom-modeline][doom-modeline]]
 
 * Keybindings
 
@@ -51,6 +52,21 @@
   (kbd "DEL") 'dired-up-directory)
 #+end_src
 
+#+RESULTS:
+
+** 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
@@ -69,15 +85,6 @@
 #+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)
-#+end_src
 ** General Settings
 #+begin_src emacs-lisp
 (setq +user-org-path "~/Notes/Org")
@@ -88,7 +95,7 @@
 
 (add-to-list 'org-modules 'org-habit)
 #+end_src
-** Org Capture
+** Org Capture :toc:
 #+begin_src emacs-lisp
 (after! org (setq +org-capture-notes-file (org-path "Notes.org")
                   +org-capture-todo-file (org-path "Todo.org")
@@ -106,12 +113,12 @@
 
                     ("j" "Journal entries")
 
-                    ("jt" "Travelling Journal" entry
-                     (file+headline +org-capture-travel-journal-file "Inbox")
-                     "* %u %?\n" :prepend t)
-
-                    ("jj" "Journal" entry
+                    ("jj" "Daily Journal" entry
                      (file+olp+datetree +org-capture-journal-file)
+                     "* %U %?\n" :prepend t)
+
+                    ("jt" "Travel Journal" entry
+                     (file+headline +org-capture-journal-file "Travel")
                      "* %U %?\n" :prepend t))))
 #+end_src
 ** Org Agenda
@@ -150,3 +157,10 @@
   :config (setq org-auto-tangle-default nil)
   :hook (org-mode . org-auto-tangle-mode))
 #+end_src
+** doom-modeline
+#+begin_src emacs-lisp
+(after! doom-modeline
+  (setq doom-modeline-battery t)
+  (setq doom-modeline-time t)
+  (setq doom-modeline-major-mode-icon t))
+#+end_src