From 67cb2d49d9582c2e6a49de4e5d5dedb477b0f276 Mon Sep 17 00:00:00 2001
From: Emmet <librephoenix3@pm.me>
Date: Sun, 27 Aug 2023 09:29:42 -0500
Subject: [PATCH] Reorganized some config and updated olivetti style

---
 user/app/doom-emacs/config.el | 23 ++++++++++++-----------
 user/app/doom-emacs/doom.org  | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 4d264bd0..286bc159 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -126,6 +126,15 @@ Teach him how to program and you will frustrate him for a lifetime."
                                                    :face 'font-lock-keyword-face))
 (dashboard-setup-startup-hook)
 
+;; Smooth scrolling
+(good-scroll-mode 1)
+(setq good-scroll-duration 0.5
+      good-scroll-step 270
+      good-scroll-render-rate 0.03)
+
+(global-set-key (kbd "<next>") #'good-scroll-up-full-screen)
+(global-set-key (kbd "<prior>") #'good-scroll-down-full-screen)
+
 ;; Requires for faster loading
 (require 'org-agenda)
 (require 'dired)
@@ -263,17 +272,6 @@ Teach him how to program and you will frustrate him for a lifetime."
   (require 'org-phscroll))
 (setq phscroll-calculate-in-pixels t)
 
-;; Smooth scrolling
-(good-scroll-mode 1)
-(setq good-scroll-duration 0.5
-      good-scroll-step 270
-      good-scroll-render-rate 0.03)
-
-
-
-(global-set-key (kbd "<next>") #'good-scroll-up-full-screen)
-(global-set-key (kbd "<prior>") #'good-scroll-down-full-screen)
-
 (require 'org-download)
 
 ;; Drag-and-drop to `dired`
@@ -705,6 +703,9 @@ same directory as the org-buffer and insert a link to this file."
   (file+head "%<%Y%m%d%H%M%S>-${slug}.org" "#+title: ${title}\n")
   :unnarrowed t))))
 
+(setq olivetti-style 'fancy
+      olivetti-margin-width 100)
+(setq-default olivetti-body-width 100)
 (defun org-roam-olivetti-mode ()
   (interactive)
   (if (org-roam-file-p)
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 8d6f2e75..67e4e5ce 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -187,6 +187,15 @@ Teach him how to program and you will frustrate him for a lifetime."
                                                    :face 'font-lock-keyword-face))
 (dashboard-setup-startup-hook)
 
+;; Smooth scrolling
+(good-scroll-mode 1)
+(setq good-scroll-duration 0.5
+      good-scroll-step 270
+      good-scroll-render-rate 0.03)
+
+(global-set-key (kbd "<next>") #'good-scroll-up-full-screen)
+(global-set-key (kbd "<prior>") #'good-scroll-down-full-screen)
+
 ;; Requires for faster loading
 (require 'org-agenda)
 (require 'dired)
@@ -331,17 +340,6 @@ Teach him how to program and you will frustrate him for a lifetime."
   (require 'org-phscroll))
 (setq phscroll-calculate-in-pixels t)
 
-;; Smooth scrolling
-(good-scroll-mode 1)
-(setq good-scroll-duration 0.5
-      good-scroll-step 270
-      good-scroll-render-rate 0.03)
-
-
-
-(global-set-key (kbd "<next>") #'good-scroll-up-full-screen)
-(global-set-key (kbd "<prior>") #'good-scroll-down-full-screen)
-
 #+END_SRC
 *** Org Download, Image Capture, and Opening Files in External Programs
 #+BEGIN_SRC emacs-lisp :tangle config.el
@@ -822,6 +820,9 @@ exit
 #+END_SRC
 *** Org Roam Olivetti Mode
 #+BEGIN_SRC emacs-lisp :tangle config.el
+(setq olivetti-style 'fancy
+      olivetti-margin-width 100)
+(setq-default olivetti-body-width 100)
 (defun org-roam-olivetti-mode ()
   (interactive)
   (if (org-roam-file-p)
@@ -833,7 +834,6 @@ exit
 
 #+END_SRC
 *** Org Roam Dynamic Blocks
-This needs fixing on NixOS:
 #+BEGIN_SRC emacs-lisp :tangle config.el
 (add-load-path! "~/.emacs.d/org-nursery/lisp")
 (require 'org-roam-dblocks)