(Emacs/elisp)~personal primary no longer has differing fonts

Now we just use Hack

1 files changed, 11 insertions, 13 deletions

diff --git a/Emacs/.config/emacs/elisp/personal-primary-theme.el b/Emacs/.config/emacs/elisp/personal-primary-theme.el
index 07ef4fa..ed1bbd0 100644
--- a/Emacs/.config/emacs/elisp/personal-primary-theme.el
+++ b/Emacs/.config/emacs/elisp/personal-primary-theme.el
@@ -23,18 +23,18 @@
  '(font-lock-builtin-face ((t (:foreground "powder blue"))))
  '(font-lock-comment-delimiter-face ((t (:slant italic :foreground "grey24"))))
  '(font-lock-comment-face ((t (:slant italic :foreground "#868686"))))
- '(font-lock-constant-face ((t (:foreground "indian red" :weight semi-bold :height 0.99 :family "Source Code Pro"))))
+ '(font-lock-constant-face ((t (:foreground "indian red" :weight semi-bold))))
  '(font-lock-doc-face ((t (:inherit (font-lock-string-face)))))
  '(font-lock-function-name-face ((t (:weight semi-bold :foreground "#b6b6b6"))))
  '(font-lock-function-call-face ((t (:weight semi-bold :foreground "#b6b6b6"))))
- '(font-lock-keyword-face ((t (:foreground "spring green" :weight bold :height 0.95 :family "Fira Code"))))
+ '(font-lock-keyword-face ((t (:foreground "spring green" :weight bold))))
  '(font-lock-negation-char-face ((t nil)))
- '(font-lock-preprocessor-face ((t (:family "Source Code Pro" :foreground "#868686"))))
+ '(font-lock-preprocessor-face ((t (:foreground "#868686"))))
  '(font-lock-regexp-grouping-backslash ((t (:inherit (bold)))))
  '(font-lock-regexp-grouping-construct ((t (:inherit (bold)))))
- '(font-lock-string-face ((t (:family "DejaVu Sans Mono" :slant italic :weight light :foreground "yellow4"))))
- '(font-lock-type-face ((t (:weight light :foreground "deepskyblue" :family "DejaVu Sans Mono"))))
- '(font-lock-variable-name-face ((nil (:family "Source Code Pro" :foreground "white"))))
+ '(font-lock-string-face ((t (:slant italic :weight normal :foreground "yellow3"))))
+ '(font-lock-type-face ((t (:weight normal :foreground "deepskyblue"))))
+ '(font-lock-variable-name-face ((nil (:foreground "white"))))
  '(font-lock-warning-face ((t (:inherit (error)))))
  '(fringe ((t (:background "grey4"))))
  '(haskell-interactive-face-prompt ((t (:foreground "green"))))
@@ -51,11 +51,10 @@
  '(link-visited ((t (:foreground "violet" :inherit (link)))))
  '(match ((t (:background "RoyalBlue3"))))
  '(minibuffer-prompt ((t (:foreground "cyan"))))
- '(mode-line ((t (:box nil :foreground "LightSkyBlue" :background "black"))))
+ '(mode-line ((t (:box t :foreground "LightSkyBlue" :background "black"))))
+ '(mode-line-inactive ((t (:box nil :weight light :foreground "CadetBlue" :background "grey7"))))
  '(mode-line-buffer-id ((t (:weight bold))))
  '(mode-line-emphasis ((t (:weight bold))))
- '(mode-line-inactive ((t (:weight light :foreground "CadetBlue" :background "grey7"
-                           :inherit (mode-line)))))
  '(next-error ((t (:inherit (region)))))
  '(orderless-match-face-0 ((t (:weight bold :foreground "lime green"))))
  '(orderless-match-face-1 ((t (:weight bold :foreground "light green"))))
@@ -75,13 +74,12 @@
  '(secondary-selection
    ((t (:extend t :background "SkyBlue4"))))
  '(tooltip ((t (:foreground "black" :background "lightyellow" :inherit (variable-pitch)))))
- '(trailing-whitespace ((((class color) (background light)) (:background "red1"))
-                        (((class color) (background dark)) (:background "red1"))))
+ '(trailing-whitespace ((t (:background "red1"))))
  '(variable-pitch ((((type w32)) (:foundry "outline" :family "Arial")) (t (:family "Sans Serif"))))
  '(whitespace-line ((t (:background "black" :foreground "violet"))))
- '(whitespace-space ((t (:background "grey6" :foreground "black"))))
+ '(whitespace-space ((t (:background "#050505" :foreground "black"))))
  '(whitespace-tab ((t (:background "grey5" :foreground "grey20"))))
- '(default ((t (:family "Source Code Pro" :foundry "ADBO" :width normal
+ '(default ((t (:family "Hack" :foundry "ADBO" :width normal
                 :weight normal :slant normal :underline nil :overline nil
                 :extend nil :strike-through nil :box nil :inverse-video nil
                 :foreground "#b6b6b6" :background "black" :stipple nil :inherit nil)))))