From 9dc0df64eeae03b2f5073c6626304525dc8feb79 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Thu, 30 Jan 2020 14:55:18 -0500
Subject: [PATCH] emacs: fix theme ordering

---
 emacs/auto/-defaults.el |  6 ++++++
 emacs/auto/-packages.el | 23 ++++-------------------
 emacs/custom.el         |  7 -------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/emacs/auto/-defaults.el b/emacs/auto/-defaults.el
index 3e9e674..d894b00 100644
--- a/emacs/auto/-defaults.el
+++ b/emacs/auto/-defaults.el
@@ -7,4 +7,10 @@
 (add-to-list 'default-frame-alist '(width  . 80))
 (add-to-list 'default-frame-alist '(height . 55))
 
+(require 'rand-theme)
+(setq rand-theme-wanted '(base16-atelier-cave
+                          base16-atelier-forest
+                          base16-atelier-heath))
+(rand-theme)
+
 ;; EOF
diff --git a/emacs/auto/-packages.el b/emacs/auto/-packages.el
index 4af0d5d..628af81 100644
--- a/emacs/auto/-packages.el
+++ b/emacs/auto/-packages.el
@@ -11,14 +11,14 @@
 (powerline-center-evil-theme)
 
 (require 'org)
-(dolist (face '(org-block-begin-line
+(dolist (face '(org-block
+                org-block-begin-line
                 org-block-end-line
-                org-block
+                org-checkbox
                 org-code
                 org-date
                 org-document-info-keyword
-                org-verbatim
-                org-checkbox))
+                org-verbatim))
   (set-face-attribute face nil :inherit 'fixed-pitch))
 
 (require 'smart-tabs-mode)
@@ -41,21 +41,6 @@
 (require 'mozc)
 (setq default-input-method "japanese-mozc")
 
-; HOW IS THERE SERIOUSLY A PACKAGE FOR THIS!?
-(require 'rand-theme)
-(setq rand-theme-wanted '(base16-ashes
-                          base16-atelier-cave
-                          base16-atelier-forest
-                          base16-atelier-heath
-                          base16-circus
-                          base16-dracula
-                          base16-material-palenight
-                          base16-monokai
-                          base16-onedark
-                          base16-porple
-                          base16-unikitty-dark))
-(rand-theme)
-
 (require 'ialign)
 
 ;; EOF
diff --git a/emacs/custom.el b/emacs/custom.el
index f26ea66..5c49146 100644
--- a/emacs/custom.el
+++ b/emacs/custom.el
@@ -3,18 +3,11 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(ansi-color-names-vector
-   ["#19171c" "#be4678" "#2a9292" "#a06e3b" "#576ddb" "#955ae7" "#576ddb" "#8b8792"])
- '(ansi-term-color-vector
-   [unspecified "#19171c" "#be4678" "#2a9292" "#a06e3b" "#576ddb" "#955ae7" "#576ddb" "#8b8792"])
  '(auto-save-default nil)
  '(backup-directory-alist (quote ((".*" . "~/.emacs.d/backup"))))
  '(before-save-hook (quote (copyright-update delete-trailing-whitespace)))
  '(create-lockfiles nil)
  '(current-language-environment "UTF-8")
- '(custom-safe-themes
-   (quote
-    ("1d079355c721b517fdc9891f0fda927fe3f87288f2e6cc3b8566655a64ca5453" default)))
  '(dired-listing-switches "-alhp --si")
  '(diredfl-global-mode t nil (diredfl))
  '(evil-cjk-emacs-word-boundary t)