From 19b44d01945b2633fddfbdaf7fabfabb4b20d960 Mon Sep 17 00:00:00 2001
From: John Doty <john@d0ty.me>
Date: Sat, 17 Aug 2024 22:16:38 -0700
Subject: [PATCH] Dark Themes

---
 .emacs.d/custom.el | 36 ++++++++++--------------------------
 .emacs.d/init.el   | 11 +++++++----
 2 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index bb8fd88..90446c4 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -12,8 +12,7 @@
  '(c-label-minimum-indentation 0)
  '(c-label-offset -4)
  '(clojure-build-tool-files
-   '("project.clj" "build.boot" "build.gradle" "build.gradle.kts" "deps.edn"
-     "shadow-cljs.edn" "TARGETS"))
+   '("project.clj" "build.boot" "build.gradle" "build.gradle.kts" "deps.edn" "shadow-cljs.edn" "TARGETS"))
  '(comint-input-ignoredups t)
  '(comint-prompt-read-only t)
  '(comint-scroll-to-bottom-on-input t)
@@ -59,38 +58,23 @@
  '(org-odd-levels-only t)
  '(org-todo-keywords '((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED")))
  '(package-selected-packages
-   '(adaptive-wrap add-node-modules-path ag auto-complete auto-complete-nxml
-                   bazel blacken cider clang-format clojure-mode
-                   color-theme-monokai color-theme-sanityinc-solarized
-                   color-theme-sanityinc-tomorrow company company-jedi
-                   company-lsp compat cquery dash-functional deadgrep
-                   dockerfile-mode earthfile-mode eglot eglot-java elm-mode
-                   esup exec-path-from-shell filladapt flycheck flycheck-elm
-                   flycheck-rust flymake flyspell fsharp-mode geiser
-                   gnu-elpa-keyring-update go-autocomplete go-mode
-                   graphviz-dot-mode hack-mode haxe-mode howm ink-mode
-                   js2-mode js2-refactor json-mode lsp-hack lsp-pyright
-                   lsp-ui lua-mode magit markdown-mode merlin mocha
-                   modus-themes monky monokai-theme multi-term mustache-mode
-                   nyan-mode paredit popup prettier-js projectile
-                   protobuf-mode python-mode rjsx-mode ruby-mode rust-mode
-                   sql-indent swift-mode switch-window terraform-mode thrift
-                   tide tree-sitter tss tuareg typescript-mode use-package
-                   vterm web-mode wgrep xref-js2 xterm-color yaml-mode
-                   zig-mode))
+   '(doom-themes adaptive-wrap add-node-modules-path ag auto-complete auto-complete-nxml bazel blacken cider clang-format clojure-mode color-theme-monokai color-theme-sanityinc-solarized color-theme-sanityinc-tomorrow company company-jedi company-lsp compat cquery dash-functional deadgrep dockerfile-mode earthfile-mode eglot eglot-java elm-mode esup exec-path-from-shell filladapt flycheck flycheck-elm flycheck-rust flymake flyspell fsharp-mode geiser gnu-elpa-keyring-update go-autocomplete go-mode graphviz-dot-mode hack-mode haxe-mode howm ink-mode js2-mode js2-refactor json-mode lsp-hack lsp-pyright lsp-ui lua-mode magit markdown-mode merlin mocha modus-themes monky monokai-theme multi-term mustache-mode nyan-mode paredit popup prettier-js projectile protobuf-mode python-mode rjsx-mode ruby-mode rust-mode sql-indent swift-mode switch-window terraform-mode thrift tide tree-sitter tss tuareg typescript-mode use-package vterm web-mode wgrep xref-js2 xterm-color yaml-mode zig-mode))
  '(reb-re-syntax 'string)
  '(rmail-mail-new-frame t)
  '(safe-local-variable-values
    '((docker-image-name . "onceandfuture")
-     (eval ignore-errors
-           "Write-contents-functions is a buffer-local alternative to before-save-hook"
+     (eval ignore-errors "Write-contents-functions is a buffer-local alternative to before-save-hook"
            (add-hook 'write-contents-functions
-                     (lambda nil (delete-trailing-whitespace) nil))
+                     (lambda nil
+                       (delete-trailing-whitespace)
+                       nil))
            (require 'whitespace)
            "Sometimes the mode needs to be toggled off and on."
-           (whitespace-mode 0) (whitespace-mode 1))
+           (whitespace-mode 0)
+           (whitespace-mode 1))
      (whitespace-line-column . 80)
-     (whitespace-style face trailing lines-tail) (require-final-newline . t)))
+     (whitespace-style face trailing lines-tail)
+     (require-final-newline . t)))
  '(scroll-conservatively 1)
  '(scroll-step 1)
  '(sd-user-email "johndoty@microsoft.com")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8a8f00b..0d283de 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -233,10 +233,13 @@
 
 (use-package modus-themes :ensure t
   :config
-  (load-theme (if (display-graphic-p)
-                  'modus-operandi
-                'modus-vivendi)
-              t))
+  (unless (display-graphic-p)
+    (load-theme 'modus-vivendi t)))
+
+(use-package doom-themes :ensure t
+  :config
+  (if (display-graphic-p)
+      (load-theme 'doom-dark+ t)))
 
 ;; =================================================================
 ;; FUN WITH KEY BINDINGS!  YAAAAYYY!!!