From fb148c5f8fb8d785cb02096cdbb6d83e63ca2b47 Mon Sep 17 00:00:00 2001
From: Ian Keane <ian@keane.sh>
Date: Thu, 30 Nov 2023 14:25:45 -0500
Subject: [PATCH] Reorder some lines in emacs config

---
 guix/init.org | 131 +++++++++++++++++++++++++-------------------------
 1 file changed, 65 insertions(+), 66 deletions(-)

diff --git a/guix/init.org b/guix/init.org
index bef77bf..008249c 100644
--- a/guix/init.org
+++ b/guix/init.org
@@ -138,67 +138,6 @@ Eventually I'll set this up so that all these directories are set in the config
     (interactive)
     (load-file user-init-file))
 #+end_src
-* Notes
-#+begin_src emacs-lisp
-  (use-package deft)
-  (setq deft-recursive t
-        deft-extensions '("org" "txt"))
-#+end_src
-* AI
-#+begin_src emacs-lisp
-  (use-package gptel)
-  (setq gptl-default-mode 'org-mode)
-#+end_src
-* Org Mode
-#+begin_src emacs-lisp
-  (use-package org)
-
-  (add-hook 'org-mode-hook 'yas-minor-mode)
-
-  (org-babel-do-load-languages
-   'org-babel-load-languages
-   '((emacs-lisp . t)
-     (python . t)))
-
-  (setq org-confirm-babel-evaluate nil)
-
-  (require 'org-tempo)
-  (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
-  (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
-
-  (add-to-list 'org-structure-template-alist '("py" . "src python"))  
-
-  (setq org-hide-emphasis-markers t)
-
-  (use-package org-appear
-    :hook (org-mode . org-appear-mode))
-
-  (use-package org-roam
-    :custom
-    (org-roam-directory "~/notes/roam")
-    :config
-    (org-roam-db-autosync-mode))
-
-  (use-package deft
-    :commands (deft)
-    :config 
-    (setq deft-directory "~/notes/deft"
-	  deft-extensions '("org" "txt")
-	  deft-recursive t))
-
-  (use-package ox-hugo
-    :after ox)
-
-  (use-package org-roam-ui
-    :after org-roam
-    :config
-    (setq org-roam-ui-sync-theme t
-	  org-roam-ui-follow t
-	  org-roam-ui-update-on-save t
-	  org-roam-ui-open-on-start t))
-
-  (use-package ox-gfm)  ; github-flavored-markdown exporter
-#+end_src
 * Basic Appearance and Behaviors
 ** Font and Theme
 #+begin_src emacs-lisp
@@ -207,19 +146,18 @@ Eventually I'll set this up so that all these directories are set in the config
     ;; Global settings (defaults)
     (setq doom-themes-enable-bold t    ; if nil, bold is universally disabled
 	  doom-themes-enable-italic t) ; if nil, italics is universally disabled
-
-
     ;; Enable flashing mode-line on errors
     (setq doom-themes-treemacs-theme "doom-atom") ; use "doom-colors" for less minimal icon theme
-    (load-theme 'doom-oceanic-next t)
     (doom-themes-treemacs-config)
     ;; Corrects (and improves) org-mode's native fontification.
     (doom-themes-org-config))
 
   (set-frame-font "DejaVu Sans Mono 16")
 
-  ;; (use-package base16-theme)
-  ;; (load-theme 'base16-oceanicnext t)
+  ;; (load-theme 'doom-oceanic-next t)
+
+  (use-package base16-theme)
+  (load-theme 'base16-oceanicnext t)
 
   (use-package default-text-scale
     :defer 1
@@ -683,6 +621,67 @@ I know these could be bound on a per-package basis, but since this is my primary
       ))
 #+end_src
 
+* Notes
+#+begin_src emacs-lisp
+  (use-package deft)
+  (setq deft-recursive t
+        deft-extensions '("org" "txt"))
+#+end_src
+* AI
+#+begin_src emacs-lisp
+  (use-package gptel)
+  (setq gptl-default-mode 'org-mode)
+#+end_src
+* Org Mode
+#+begin_src emacs-lisp
+  (use-package org)
+
+  (add-hook 'org-mode-hook 'yas-minor-mode)
+
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   '((emacs-lisp . t)
+     (python . t)))
+
+  (setq org-confirm-babel-evaluate nil)
+
+  (require 'org-tempo)
+  (add-to-list 'org-structure-template-alist '("sh" . "src shell"))
+  (add-to-list 'org-structure-template-alist '("el" . "src emacs-lisp"))
+
+  (add-to-list 'org-structure-template-alist '("py" . "src python"))  
+
+  (setq org-hide-emphasis-markers t)
+
+  (use-package org-appear
+    :hook (org-mode . org-appear-mode))
+
+  (use-package org-roam
+    :custom
+    (org-roam-directory "~/notes/roam")
+    :config
+    (org-roam-db-autosync-mode))
+
+  (use-package deft
+    :commands (deft)
+    :config 
+    (setq deft-directory "~/notes/deft"
+	  deft-extensions '("org" "txt")
+	  deft-recursive t))
+
+  (use-package ox-hugo
+    :after ox)
+
+  (use-package org-roam-ui
+    :after org-roam
+    :config
+    (setq org-roam-ui-sync-theme t
+	  org-roam-ui-follow t
+	  org-roam-ui-update-on-save t
+	  org-roam-ui-open-on-start t))
+
+  (use-package ox-gfm)  ; github-flavored-markdown exporter
+#+end_src
 * Project management
 #+begin_src emacs-lisp
   (use-package projectile)  ; todo config inside use-package