9 files changed, 14 insertions, 34 deletions
diff --git a/.emacs b/.emacs
index b9f70e0..ced6f19 100644
--- a/.emacs
+++ b/.emacs
@@ -1,7 +1,6 @@
 (add-to-list 'load-path "~/.emacs.local.d/config/")
 
 ;; Load up the general config
-(load-file "~/.emacs.local.d/config.el")
 (load-file "~/.emacs.local.d/general.el")
 (load-file "~/.emacs.local.d/mail.el")
 
diff --git a/.emacs.local.d/mail.el b/.emacs.local.d/config/rul-config-mail.el
index cee35a5..143bbc3 100644
--- a/.emacs.local.d/mail.el
+++ b/.emacs.local.d/config/rul-config-mail.el
@@ -11,3 +11,5 @@
       mail-specify-envelope-from t
       message-sendmail-envelope-from 'header
       mail-envelope-from 'header)
+
+(provide 'rul-config-mail)
diff --git a/.emacs.local.d/config.el b/.emacs.local.d/config/rul-config-org.el
index 876fcb4..020efa4 100644
--- a/.emacs.local.d/config.el
+++ b/.emacs.local.d/config/rul-config-org.el
@@ -13,5 +13,7 @@
  my-org-journal-time-format ""
  my-org-refile-path "~/refile.org"
  my-org-roam-directory "~/org/roam/"
- my-projectile-project-search-path '("~/src/")
-)
+ )
+
+(provide 'rul-config-org)
+
diff --git a/.emacs.local.d/config/rul-config-projectile.el b/.emacs.local.d/config/rul-config-projectile.el
new file mode 100644
index 0000000..3922c8f
--- /dev/null
+++ b/.emacs.local.d/config/rul-config-projectile.el
@@ -0,0 +1,2 @@
+(setq my-projectile-project-search-path '("~/src/"))
+(provide 'rul-config-projectile)
diff --git a/.emacs.local.d/modes/notmuch.el b/.emacs.local.d/modes/notmuch.el
index f4ed127..5a5c9a9 100644
--- a/.emacs.local.d/modes/notmuch.el
+++ b/.emacs.local.d/modes/notmuch.el
@@ -2,37 +2,7 @@
 ;; notmuch mode
 ;; --------
 (require 'notmuch)
-
-;; This should be upstream
-(require 'notmuch-show)
-(require 'notmuch-tag)
-(defun notmuch-tree-show-message-in ()
-  "Show the current message (in split-pane)."
-  (interactive)
-  (let ((id (notmuch-tree-get-message-id))
-        (inhibit-read-only t)
-        buffer)
-    (when id
-      ;; We close and reopen the window to kill off un-needed buffers
-      ;; this might cause flickering but seems ok.
-      (notmuch-tree-close-message-window)
-      (setq notmuch-tree-message-window
-            (split-window-vertically (/ (window-height) 4)))
-      (with-selected-window notmuch-tree-message-window
-        ;; Since we are only displaying one message do not indent.
-        (let ((notmuch-show-indent-messages-width 0)
-              (notmuch-show-only-matching-messages t))
-          (setq buffer (notmuch-show id))))
-      ;; We need the `let' as notmuch-tree-message-window is buffer local.
-      (let ((window notmuch-tree-message-window))
-        (with-current-buffer buffer
-          (setq notmuch-tree-message-window window)
-          (add-hook 'kill-buffer-hook 'notmuch-tree-message-window-kill-hook)))
-      (when notmuch-show-mark-read-tags
-        (notmuch-tree-tag-update-display notmuch-show-mark-read-tags)
-        (notmuch-tree-tag notmuch-show-mark-read-tags))
-      (setq notmuch-tree-message-buffer buffer))))
-;; End upstream
+(require 'rul-config-mail)
 
 ;; Keymaps
 (defun rul/capture-mail()
diff --git a/.emacs.local.d/modes/org-journal.el b/.emacs.local.d/modes/org-journal.el
index 5bc2671..7bf217d 100644
--- a/.emacs.local.d/modes/org-journal.el
+++ b/.emacs.local.d/modes/org-journal.el
@@ -6,6 +6,7 @@
   (setq org-journal-file-format my-org-journal-file-format)
   (setq org-journal-enable-agenda-integration t)
   :config
+  (require 'rul-config-org)
   (setq org-journal-dir my-org-journal-dir
         org-journal-file-type my-org-journal-file-type
         org-journal-time-prefix my-org-journal-time-prefix
diff --git a/.emacs.local.d/modes/org-roam.el b/.emacs.local.d/modes/org-roam.el
index dd19ad8..422eb93 100644
--- a/.emacs.local.d/modes/org-roam.el
+++ b/.emacs.local.d/modes/org-roam.el
@@ -8,6 +8,7 @@
          ("C-c n f" . org-roam-node-find)
          ("C-c n i" . org-roam-node-insert))
   :config
+  (require 'rul-config-org)
   (org-roam-setup)
   (add-to-list 'display-buffer-alist
                '("\\*org-roam\\*"
diff --git a/.emacs.local.d/modes/org.el b/.emacs.local.d/modes/org.el
index c003b6c..51b269e 100644
--- a/.emacs.local.d/modes/org.el
+++ b/.emacs.local.d/modes/org.el
@@ -7,6 +7,8 @@
 
 (require 'org-modern)
 
+(require 'rul-config-org)
+
 ;; --------
 ;; Org mode
 ;; --------
diff --git a/.emacs.local.d/modes/projectile.el b/.emacs.local.d/modes/projectile.el
index ed95775..df85aec 100644
--- a/.emacs.local.d/modes/projectile.el
+++ b/.emacs.local.d/modes/projectile.el
@@ -4,5 +4,6 @@
   :hook
   (after-init . projectile-global-mode)
   :config
+  (require 'rul-config-projectile)
   (setq projectile-completion-system 'ivy)
 )