Fixing org not loading and making daemon work properly

README.org

@@ -82,12 +82,22 @@ In order to have this config work on both my desktop with regular joe-schmoe mon
     (defvar chris/default-font-size 240)
   (defvar chris/default-font-size 120))
 
-(set-face-attribute 'default nil :font "VictorMono Nerd Font"
+(defun chris/set-font-faces ()
+  "Set the faces for our fonts"
+  (message "Setting faces!")
+  (set-face-attribute 'default nil :font "VictorMono Nerd Font"
                       :height chris/default-font-size)
-(set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font"
+  (set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font"
                       :height chris/default-font-size)
-(set-face-attribute 'variable-pitch nil :font "Cantarell"
+  (set-face-attribute 'variable-pitch nil :font "Cantarell"
-                    :height chris/default-font-size :weight 'regular)
+                      :height chris/default-font-size :weight 'regular))
+
+(if (daemonp)
+    (add-hook 'after-make-frame-functions
+	      (lambda (frame)
+		(with-selected-frame frame
+		  (chris/set-font-faces))))
+  (chris/set-font-faces))
 #+end_src
 
 Then let's make sure line-numbers are relative and on. And let's turn on visual-line-mode globally.
@@ -149,7 +159,12 @@ Let's also turn on =recentf-mode=.
   (doom-modeline-mode 1)
   (setq doom-modeline-height 35
         doom-modeline-bar-width 3
-        all-the-icons-scale-factor 0.9))
+        all-the-icons-scale-factor 0.9)
+  (if (daemonp)
+      (add-hook 'after-make-frame-functions
+		(lambda (frame)
+		  (with-selected-frame frame
+		    (setq doom-modeline-icon t))))))
 #+end_src
 
 #+begin_src emacs-lisp
@@ -328,8 +343,24 @@ I prefer selectrum over Ivy or Helm for completions. It is using the basic compl
   :init
   (selectrum-mode +1)
   :config
-  (setq selectrum-max-window-height 10)
+  (setq selectrum-max-window-height 8)
   (add-hook 'selectrum-mode-hook 'selectrum-exhibit)
+
+  ;; We need to fix selectrums minibuffer handling for Emacs 28
+  (defun selectrum--set-window-height (window &optional height)
+  "Set window height of WINDOW to HEIGHT pixel.
+If HEIGHT is not given WINDOW will be updated to fit its content
+vertically."
+  (let* ((lines (length
+                 (split-string
+                  (overlay-get selectrum--candidates-overlay 'after-string)
+                  "\n" t)))
+         (dheight (or height
+                      (* lines selectrum--line-height)))
+         (wheight (window-pixel-height window))
+         (window-resize-pixelwise t))
+    (window-resize
+     window (- dheight wheight) nil nil 'pixelwise)))
   :general
   ('selectrum-minibuffer-map
    "C-j" 'selectrum-next-candidate
@@ -535,6 +566,7 @@ This is the use-package definition with a lot of customization. Need to setup au
 Part of this config includes some special capture templates for my work as a youth minister. I create lessons through both org-mode and org-roam capture templates. The first part comes from org-roam, then the next is org-mode.
 #+begin_src emacs-lisp
 (use-package org
+  :straight (:type built-in)
   :config
   (setq org-startup-indented t
   org-edit-src-content-indentation 0
@@ -716,6 +748,7 @@ Basic Org-Roam setup. We select the directory and the basic width of the Org-Roa
 We also need to setup some capture templates to use some specific setups with my journalling. These include a space for my [[file:../../org/homework_for_life.org][Homework For Life]], tasks for the day, and how I can love on my family.
 #+BEGIN_SRC emacs-lisp
 (use-package org-roam
+  :after org
   :hook (org-load . org-roam-mode)
   :commands (org-roam org-roam-find-file)
   :config

init.el

@@ -22,12 +22,22 @@
     (defvar chris/default-font-size 240)
   (defvar chris/default-font-size 120))
 
-(set-face-attribute 'default nil :font "VictorMono Nerd Font"
+(defun chris/set-font-faces ()
+  "Set the faces for our fonts"
+  (message "Setting faces!")
+  (set-face-attribute 'default nil :font "VictorMono Nerd Font"
                       :height chris/default-font-size)
-(set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font"
+  (set-face-attribute 'fixed-pitch nil :font "VictorMono Nerd Font"
                       :height chris/default-font-size)
-(set-face-attribute 'variable-pitch nil :font "Cantarell"
+  (set-face-attribute 'variable-pitch nil :font "Cantarell"
-                    :height chris/default-font-size :weight 'regular)
+                      :height chris/default-font-size :weight 'regular))
+
+(if (daemonp)
+    (add-hook 'after-make-frame-functions
+	      (lambda (frame)
+		(with-selected-frame frame
+		  (chris/set-font-faces))))
+  (chris/set-font-faces))
 
 (setq display-line-numbers-type 'relative)
 (global-display-line-numbers-mode +1)
@@ -69,7 +79,12 @@
   (doom-modeline-mode 1)
   (setq doom-modeline-height 35
         doom-modeline-bar-width 3
-        all-the-icons-scale-factor 0.9))
+        all-the-icons-scale-factor 0.9)
+  (if (daemonp)
+      (add-hook 'after-make-frame-functions
+		(lambda (frame)
+		  (with-selected-frame frame
+		    (setq doom-modeline-icon t))))))
 
 (use-package doom-themes
   :ensure t
@@ -204,8 +219,24 @@
   :init
   (selectrum-mode +1)
   :config
-  (setq selectrum-max-window-height 10)
+  (setq selectrum-max-window-height 8)
   (add-hook 'selectrum-mode-hook 'selectrum-exhibit)
+
+  ;; We need to fix selectrums minibuffer handling for Emacs 28
+  (defun selectrum--set-window-height (window &optional height)
+  "Set window height of WINDOW to HEIGHT pixel.
+If HEIGHT is not given WINDOW will be updated to fit its content
+vertically."
+  (let* ((lines (length
+                 (split-string
+                  (overlay-get selectrum--candidates-overlay 'after-string)
+                  "\n" t)))
+         (dheight (or height
+                      (* lines selectrum--line-height)))
+         (wheight (window-pixel-height window))
+         (window-resize-pixelwise t))
+    (window-resize
+     window (- dheight wheight) nil nil 'pixelwise)))
   :general
   ('selectrum-minibuffer-map
    "C-j" 'selectrum-next-candidate
@@ -299,6 +330,7 @@
   (display-line-numbers-mode -1))
 
 (use-package org
+  :straight (:type built-in)
   :config
   (setq org-startup-indented t
   org-edit-src-content-indentation 0
@@ -459,6 +491,7 @@
   (setq org-super-agenda-header-map nil))
 
 (use-package org-roam
+  :after org
   :hook (org-load . org-roam-mode)
   :commands (org-roam org-roam-find-file)
   :config