Load org configuration from config-org file.

config-org.org

@@ -1,7 +1,8 @@
 #+PROPERTY: header-args:emacs-lisp :tangle "~/.emacs.d/config-org.el" :comments both
 
-* Need this for base config
+* The all-mighty org configuration
 #+begin_src emacs-lisp
+(require 'my-org)
 (require 'my-org-agenda-files)
 #+end_src
 * Plugins
@@ -632,7 +633,7 @@
     (after-init . org-roam-mode)
     :straight (:host github :repo "jethrokuan/org-roam" :branch "master")
     :custom
-    (org-roam-directory "~/MEGA/org/org-roam/")
+    (org-roam-directory (expand-file-name "org-roam" my/org-folder))
     :bind (:map org-roam-mode-map
                 (("C-c n l" . org-roam)
                  ("C-c n f" . org-roam-find-file)

init.el

@@ -85,7 +85,6 @@
 ;; Load work stuff when at work. 
 (if my/at-ti
     (require 'work-config)
-  (require 'my-org)
   (org-babel-load-file
    (expand-file-name "config-org.org"
                      user-emacs-directory)))