Revert "config/emacs: use moe-theme"

This reverts commit e33b8f5986.

config/emacs/emacs.org

@@ -201,35 +201,37 @@ kept-old-versions 5)
 #+end_src
 ** Appearance
 #+begin_src emacs-lisp
-  ;; TODO: change this for something better i guess
+;; TODO: change this for something better i guess
-  ;; (use-package doom-themes
+(use-package doom-themes
-  ;;   :config
+  :config
-  ;;   (load-theme 'doom-monokai-spectrum t))
+  (load-theme 'doom-monokai-spectrum t))
 
+<<<<<<< HEAD
   (use-package monokai-theme
     :config
     (load-theme 'monokai t))
-
+=======
-  ;; emacsclient things
+;; emacsclient things
-  (setq frame-resize-pixelwise t)
+(setq frame-resize-pixelwise t)
-  ;; ui settings apparently go below
+;; ui settings apparently go below
-  (setq default-frame-alist '((font . "JetBrainsMono NF")
+(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
+;; GO AWAY
-  (defun my/disable-scroll-bars (frame)
+(defun my/disable-scroll-bars (frame)
   (modify-frame-parameters frame
                            '((vertical-scroll-bars . nil)
                              (horizontal-scroll-bars . nil))))
-  (add-hook 'after-make-frame-functions 'my/disable-scroll-bars)
+(add-hook 'after-make-frame-functions 'my/disable-scroll-bars)
 
 
-  ;; y/n is better than yes/no
+;; y/n is better than yes/no
-  (fset 'yes-or-no-p 'y-or-n-p)
+(fset 'yes-or-no-p 'y-or-n-p)
 
-  ;; font
+;; font
-  (set-face-attribute 'default nil
+(set-face-attribute 'default nil
 		    :font "JetBrainsMono NF"
 		    :weight 'light
 		    :height 125)