From d35bd8133a700396b01d80a133637e238c37ea0d Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@tfcconnection.org>
Date: Tue, 13 Apr 2021 06:03:44 -0500
Subject: [PATCH] Performance and startup tweaks

---
 README.org | 23 +++++++++++++----------
 init.el    | 22 ++++++++--------------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/README.org b/README.org
index 2cb55be7..d1aed217 100644
--- a/README.org
+++ b/README.org
@@ -343,9 +343,8 @@ This evil-collection package includes a lot of other evil based things.
 
 ** Better UI
 *** Olivetti
-#+begin_src emacs-lisp
+#+begin_src emacs-lisp :tangle no
 (use-package olivetti
-  :after org
   :config
   (setq olivetti-body-width 0.6
   olivetti-minimum-body-width 100))
@@ -552,8 +551,9 @@ These are some evil bindings to avy.
   (general-define-key
    :states 'normal
    :keymaps '(override magit-mode-map)
-   "F" 'magit-pull))
-
+   "F" 'magit-pull)
+  (general-def 'normal
+    "gl" 'avy-goto-line))
 #+end_src
 *** Ace-Link
 Ace link provides an avy like search for links. Upon using the keybindings presented it opens the url.
@@ -590,7 +590,8 @@ Friar is a fennel repl in the awesome repl. It allows you to interact with Aweso
 #+begin_src emacs-lisp
 (use-package friar 
   :straight (:host github :repo "warreq/friar" :branch "master"
-	     :files (:defaults "*.lua" "*.fnl")))
+	     :files (:defaults "*.lua" "*.fnl"))
+  :after fennel-mode)
 #+end_src
 
 *** Yaml
@@ -730,6 +731,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
+  :defer 1
   :config
   (setq org-startup-indented t
 	org-edit-src-content-indentation 0
@@ -918,7 +920,7 @@ We also need to add =evil-org= to make better keybindings.
 Super Agenda gives me a really nice way of making the agenda view look a lot better with some better information included.
 #+begin_src emacs-lisp
 (use-package org-super-agenda
-  :after org-agenda
+  :after org
   :init
   (setq org-super-agenda-groups '((:name "Today"
                                    :time-grid t
@@ -946,8 +948,7 @@ We also need to setup some capture templates to use some specific setups with my
 #+BEGIN_SRC emacs-lisp
 (use-package org-roam
   :after org
-  :hook org-load
-  :commands (org-roam org-roam-find-file)
+  :commands (org-roam org-roam-find-file org-roam-insert)
   :config
   (setq org-roam-directory "~/org")
   (setq org-roam-buffer-width 0.25)
@@ -1313,10 +1314,12 @@ If on a:
     :keymaps 'override
     "om" 'mu4e))
 
-(use-package org-mime
-  :ensure t)
 #+end_src
 
+# (use-package org-mime
+#   :after
+#   :ensure t)
+
 Let's add org-msg to write emails in org-mode
 #+begin_src emacs-lisp
 (use-package org-msg
diff --git a/init.el b/init.el
index 8d65fa53..46b67315 100644
--- a/init.el
+++ b/init.el
@@ -228,12 +228,6 @@
    "j" 'undo-tree-visualize-redo
    "k" 'undo-tree-visualize-undo))
 
-(use-package olivetti
-  :after org
-  :config
-  (setq olivetti-body-width 0.6
-  olivetti-minimum-body-width 100))
-
 (use-package visual-fill-column
   :after org
   :config
@@ -333,7 +327,9 @@ vertically."
   (general-define-key
    :states 'normal
    :keymaps '(override magit-mode-map)
-   "F" 'magit-pull))
+   "F" 'magit-pull)
+  (general-def 'normal
+    "gl" 'avy-goto-line))
 
 (use-package ace-link
   :after avy)
@@ -352,7 +348,8 @@ vertically."
 
 (use-package friar 
   :straight (:host github :repo "warreq/friar" :branch "master"
-	     :files (:defaults "*.lua" "*.fnl")))
+	     :files (:defaults "*.lua" "*.fnl"))
+  :after fennel-mode)
 
 (use-package yaml-mode
   :mode ("\\.yml\\'" . yaml-mode))
@@ -440,6 +437,7 @@ vertically."
 	visual-fill-column-center-text t))
 
 (use-package org
+  :defer 1
   :config
   (setq org-startup-indented t
 	org-edit-src-content-indentation 0
@@ -614,7 +612,7 @@ vertically."
   :after org)
 
 (use-package org-super-agenda
-  :after org-agenda
+  :after org
   :init
   (setq org-super-agenda-groups '((:name "Today"
                                    :time-grid t
@@ -634,8 +632,7 @@ vertically."
 
 (use-package org-roam
   :after org
-  :hook org-load
-  :commands (org-roam org-roam-find-file)
+  :commands (org-roam org-roam-find-file org-roam-insert)
   :config
   (setq org-roam-directory "~/org")
   (setq org-roam-buffer-width 0.25)
@@ -987,9 +984,6 @@ If on a:
     :keymaps 'override
     "om" 'mu4e))
 
-(use-package org-mime
-  :ensure t)
-
 (use-package org-msg
   :hook (mu4e-compose-mode . org-msg-edit-mode)
   :config