From 348f7d648b8e67acd893e6db777cd8c5eaf699eb Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Sat, 13 Nov 2021 20:26:37 -0600
Subject: [PATCH] Cleaning up config.

---
 .config/doom/config.el  | 5 +++--
 .config/doom/config.org | 8 ++++----
 .config/doom/init.el    | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.config/doom/config.el b/.config/doom/config.el
index d87ba73..927342d 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -280,7 +280,7 @@
 (map! :leader
       :desc "Org babel tangle" "m B" #'org-babel-tangle)
 (after! org
-  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+  ;;(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
   (setq org-directory "~/nc/Org/"
         org-agenda-files '("~/nc/Org/agenda.org")
         org-default-notes-file (expand-file-name "notes.org" org-directory)
@@ -342,7 +342,8 @@
          :publishing-function org-publish-attachment)
       ))
 
-(setq org-roam-directory "~/nc/Roam")
+(after! org
+  (setq org-roam-directory "~/nc/Roam"))
 
 (use-package! password-store)
 
diff --git a/.config/doom/config.org b/.config/doom/config.org
index 70ac936..0c7deff 100644
--- a/.config/doom/config.org
+++ b/.config/doom/config.org
@@ -517,16 +517,15 @@ Keybindings to open files that I work with all the time using the find-file comm
 #+END_SRC
 
 * ORG MODE
-I wrapped most of this block in (after! org).  Without this, my settings might be evaluated too early, which will result in my settings being overwritten by Doom's defaults.  I have also enabled org-journal by adding (+journal) to the org section of my Doom Emacs init.el.
+I wrapped most of this block in (after! org).  Without this, my settings might be evaluated too early, which will result in my settings being overwritten by Doom's defaults.  I have also enabled org-bullets, org-journal and org-roam by adding (+journal +pretty +roam) to the org section of my Doom Emacs init.el.
 
 =NOTE:= I have the location of my Org directory and Roam directory in $HOME/nc/ which is a Nextcloud folder that allows me to instantly sync all of my Org work between my home computer and my office computer.
 
-
 #+BEGIN_SRC emacs-lisp
 (map! :leader
       :desc "Org babel tangle" "m B" #'org-babel-tangle)
 (after! org
-  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
+  ;;(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
   (setq org-directory "~/nc/Org/"
         org-agenda-files '("~/nc/Org/agenda.org")
         org-default-notes-file (expand-file-name "notes.org" org-directory)
@@ -610,7 +609,8 @@ We need ox-man for "Org eXporting" to manpage format, ox-gemini for exporting to
 | org-roam-dailies-find-yesterday | org roam dailies find yesterday | SPC n r d y |
 
 #+begin_src emacs-lisp
-(setq org-roam-directory "~/nc/Roam")
+(after! org
+  (setq org-roam-directory "~/nc/Roam"))
 #+end_src
 
 * PASSWORD STORE
diff --git a/.config/doom/init.el b/.config/doom/init.el
index bd822d4..6a8ec0a 100644
--- a/.config/doom/init.el
+++ b/.config/doom/init.el
@@ -146,7 +146,7 @@
        ;;nim               ; python + lisp at the speed of c
        ;;nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
-       (org +org-bullets +roam)              ; organize your plain life in plain text
+       (org +journal +pretty +roam)              ; organize your plain life in plain text
        php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional