~moved theming to Functions and doom-theme to doom variables

1 files changed, 35 insertions, 35 deletions

diff --git a/doom.d/config.org b/doom.d/config.org
index c40871d..c9a6791 100644
--- a/doom.d/config.org
+++ b/doom.d/config.org
@@ -11,45 +11,11 @@ Setting up variables and basic stuff that doesn't require a lot of work.
 #+BEGIN_SRC elisp
 (after! core-keybinds
   (setq doom-localleader-key ",")
+  (setq doom-theme 'doom-molokai)
   (setq doom-font (font-spec :family "Hack" :size 19)))
 #+END_SRC
 - Set the doom localleader to "," because it's faster
 - Using the font [[https://sourcefoundry.org/hack/][Hack]] with Fira code ligatures
-** Theming
-#+BEGIN_SRC elisp
-(setq doom-theme 'doom-molokai)
-(setq oreodave/theme-list '(doom-solarized-dark doom-gruvbox doom-city-lights doom-outrun-electric doom-vibrant doom-molokai doom-solarized-light doom-acario-light))
-
-(defun oreodave/set-new-theme ()
-  "Set the theme from my own selection, mutate as you see fit"
-  (interactive)
-  (ivy-read "Select theme: "
-            oreodave/theme-list
-            :caller 'oreodave/set-new-theme
-            :action (lambda (x) ; Shamelessly copied from counsel in case of change
-                      (condition-case nil
-                          (progn
-                            (mapc #'disable-theme custom-enabled-themes)
-                            (load-theme (intern x) t)
-                            (when (fboundp 'powerline-reset)
-                              (powerline-reset)))
-                        (error "Problem loading theme %s" x)))))
-#+END_SRC
-- Themes sanctioned by me:
-  - doom-solarized-dark: just the right everything. best for day.
-  - doom-gruvbox: good contrast, better for night.
-  - doom-city-lights: Eh contrast, quite dark
-  - doom-outrun-electric: Interesting colour palette
-  - doom-vibrant: Good contrast, bit lighter
-  - doom-molokai: hacker style
-  - doom-solarized-light: Light orange theme that's actually okay on the eyes
-  - doom-acario-light: Light theme with not bad colours
-- Themes not sanctioned:
-  - Any of the base16 themes for anything other than editing code, not org.
-    Contrast isn't good enough
-  - Light themes other than Emacs default, maybe sometimes solarized-light
-  - Horrid low contrast ones with no colour. Grayscale particularly. I can't
-    handle those.
 ** Interface
 #+BEGIN_SRC elisp
 (setq completion-ignore-case t)
@@ -100,6 +66,40 @@ doom private directory.
   (dired (concat org-directory "/Books")))
 #+END_SRC
 Open a Dired session to the books directory in the org-directory.
+** Change theme
+#+BEGIN_SRC elisp
+(setq oreodave/theme-list '(doom-solarized-dark doom-gruvbox doom-city-lights doom-outrun-electric doom-vibrant doom-molokai doom-solarized-light doom-acario-light))
+
+(defun oreodave/set-new-theme ()
+  "Set the theme from my own selection, mutate as you see fit"
+  (interactive)
+  (ivy-read "Select theme: "
+            oreodave/theme-list
+            :caller 'oreodave/set-new-theme
+            :action (lambda (x) ; Shamelessly copied from counsel in case of change
+                      (condition-case nil
+                          (progn
+                            (mapc #'disable-theme custom-enabled-themes)
+                            (load-theme (intern x) t)
+                            (when (fboundp 'powerline-reset)
+                              (powerline-reset)))
+                        (error "Problem loading theme %s" x)))))
+#+END_SRC
+- Themes sanctioned by me:
+  - doom-solarized-dark: just the right everything. best for day.
+  - doom-gruvbox: good contrast, better for night.
+  - doom-city-lights: Eh contrast, quite dark
+  - doom-outrun-electric: Interesting colour palette
+  - doom-vibrant: Good contrast, bit lighter
+  - doom-molokai: hacker style
+  - doom-solarized-light: Light orange theme that's actually okay on the eyes
+  - doom-acario-light: Light theme with not bad colours
+- Themes not sanctioned:
+  - Any of the base16 themes for anything other than editing code, not org.
+    Contrast isn't good enough
+  - Light themes other than Emacs default, maybe sometimes solarized-light
+  - Horrid low contrast ones with no colour. Grayscale particularly. I can't
+    handle those.
 ** Go to School directory
 #+BEGIN_SRC elisp
 (defun oreodave/goto-school ()