Revert "config/emacs: use moe-theme"

This reverts commit e33b8f5986.

config/emacs/emacs.org

@@ -202,20 +202,22 @@ kept-old-versions 5)
 ** Appearance
 #+begin_src emacs-lisp
 ;; TODO: change this for something better i guess
-  ;; (use-package doom-themes
-  ;;   :config
-  ;;   (load-theme 'doom-monokai-spectrum t))
+(use-package doom-themes
+  :config
+  (load-theme 'doom-monokai-spectrum t))
 
+<<<<<<< HEAD
   (use-package monokai-theme
     :config
     (load-theme 'monokai t))
-
+=======
 ;; emacsclient things
 (setq frame-resize-pixelwise t)
 ;; ui settings apparently go below
 (setq default-frame-alist '((font . "JetBrainsMono NF")
                             '(vertical-scroll-bars . nil)
                             '(horizontal-scroll-bars . nil)))
+>>>>>>> parent of e33b8f5 (config/emacs: use moe-theme)
 
 ;; GO AWAY
 (defun my/disable-scroll-bars (frame)