doom: smol stuff

config/dot_config/doom/config.el

@@ -1,27 +1,63 @@
 ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
 
+;; Basic User Settings
 (setq user-full-name "Jonathan Jenne"
       user-mail-address "johnnie@posteo.de")
 
-(setq +user-org-path "~/Notes/Org"
-      +user-org-todo-file "Todo.org"
-      +user-org-notes-file "Notes.org"
-      +user-org-journal-file "Journal.org")
+;; Org Path
+(setq +user-org-path "~/Notes/Org")
+(defun org-path (filename) (expand-file-name filename +user-org-path))
 
+;; Default Shell
+;; Useful if default system shell is not bash
 (setq shell-file-name (executable-find "bash"))
 
-;; This will add a key combination oF F-1-2 breaking basic typing lol
-;;(map! "<f12>" #'org-agenda-list)
+;; Custom keybindings
+(map! :n "<f12>" #'org-agenda-list)
+(map! "C-M-+" #'doom/increase-font-size)
+(map! "C-#" #'comment-line)
 
+;; Display Line numbers
 (setq display-line-numbers-type t)
+
+;; Set Emacs theme
 (setq doom-theme 'doom-gruvbox)
 
+;; Dashboard
 (setq dashboard-startup-banner nil)
 
-(setq org-src-tab-acts-natively t)
-
+;; Org-Mode
 (add-to-list 'org-modules 'org-habit)
 
+(after! org (setq org-directory +user-org-path
+                  org-src-tab-acts-natively t))
+
+;; Org Capture
+(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-travel-journal-file (org-path "Travel.org")))
+
+(after! org (setq org-capture-templates
+      '(("t" "Personal todo" entry
+         (file+headline +org-capture-todo-file "Inbox")
+         "* TODO %?\n" :prepend t)
+
+        ("n" "Personal notes" entry
+         (file+headline +org-capture-notes-file "Inbox")
+         "* %u %?\n" :prepend t)
+
+        ("j" "Journal entries")
+
+        ("jt" "Travelling Journal" entry
+         (file+headline +org-capture-travel-journal-file "Inbox")
+         "* %u %?\n" :prepend t)
+
+        ("jj" "Journal" entry
+         (file+olp+datetree +org-capture-journal-file)
+         "* %U %?\n" :prepend t))))
+
+;; Org-Agenda
 (after! org (setq
         org-agenda-show-all-dates nil
         org-agenda-span 2
@@ -37,27 +73,14 @@
         ;; Consider all org files part of the org-agenda
         org-agenda-files (list +user-org-path)))
 
+;; Org-Auto-Tangle
 (setq org-auto-tangle-default nil)
 
-(after! org (setq +org-capture-notes-file (expand-file-name +user-org-notes-file +user-org-path)
-                  +org-capture-todo-file (expand-file-name +user-org-todo-file +user-org-path)
-                  +org-capture-journal-file (expand-file-name +user-org-journal-file +user-org-path)))
-
-(setq org-capture-templates
-      '(("t" "Personal todo" entry
-         (file+headline +org-capture-todo-file "Inbox")
-         "* TODO %?\n" :prepend t)
-
-        ("n" "Personal notes" entry
-         (file+headline +org-capture-notes-file "Inbox")
-         "* %u %?\n" :prepend t)
-
-        ("j" "Journal" entry
-         (file+olp+datetree +org-capture-journal-file)
-         "* %U %?\n" :prepend t)))
-
-(setq org-directory +user-org-path)
-
+;; Hooks
 (add-hook 'org-mode-hook #'org-modern-mode)
 (add-hook 'org-agenda-finalize-hook #'org-modern-agenda)
-(add-hook 'org-mode-hook 'org-auto-tangle-mode)
+
+;; Package Configuration
+(use-package! org-auto-tangle
+  :defer t
+  :hook (org-mode . org-auto-tangle-mode))

config/dot_config/doom/init.el

@@ -37,7 +37,7 @@
        ;;hydra
        ;;indent-guides     ; highlighted indent columns
        ;;ligatures         ; ligatures and symbols to make your code pretty again
-       ;;minimap           ; show a map of the code on the side
+       minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
        ;;neotree           ; a project drawer, like NERDTree for vim

config/dot_config/doom/packages.el

@@ -5,7 +5,6 @@
 ;; on the command line, then restart Emacs for the changes to take effect -- or
 ;; use 'M-x doom/reload'.
 
-
 ;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
 ;; (package! some-package)
 ;; To disable an installed package:
@@ -14,7 +13,7 @@
 (package! org-modern)
 (package! org-auto-tangle)
 (package! org-habit-stats)
-(package! dashboard)
+(package! dashboard :disable t)
 (package! org-journal :disable t)
 
 ;; To install a package directly from a remote git repo, you must specify a