Merge branch 'master' of github.com:michael-ball/dot-emacs

1 files changed, 19 insertions, 3 deletions

diff --git a/.emacs b/.emacs
index f26cfc3..e2b348c 100755
--- a/.emacs
+++ b/.emacs
@@ -51,6 +51,7 @@
  '(emamux:runner-pane-height 30)
  '(lsp-auto-guess-root nil)
  '(lsp-restart (quote auto-restart))
+ '(lsp-ui-doc-border "#2E303E")
  '(lsp-ui-flycheck-enable t)
  '(lsp-ui-peek-always-show nil)
  '(lsp-ui-sideline-enable t)
@@ -68,11 +69,12 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(default ((t (:inherit nil :stipple nil :background "#1c1e26" :foreground "#cbced0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 1 :width normal :foundry "default" :family "default"))))
- '(airline-normal-outer ((t (:background "red" :foreground "color-18"))))
  '(company-tooltip ((t (:inherit tooltip))))
  '(company-tooltip-mouse ((t (:inherit highlight))))
+ '(cursor ((t (:background "#E93C58"))))
  '(custom-group-tag ((t (:foreground "#E93C58"))))
  '(custom-variable-tag ((t (:foreground "#E93C58"))))
+ '(diff-hunk-header ((t (:foreground "#B072D1"))))
  '(elixir-atom-face ((t (:foreground "#25B2BC"))))
  '(elixir-attribute-face ((t (:foreground "#DF5273"))))
  '(error ((t (:foreground "#E93C58" :weight bold))))
@@ -83,6 +85,7 @@
  '(font-lock-doc-face ((t (:foreground "#24A8B4" :slant oblique))))
  '(font-lock-function-name-face ((t (:foreground "#25B2BC" :weight bold :height 1.1))))
  '(font-lock-keyword-face ((t (:foreground "#B072D1" :weight bold))))
+ '(font-lock-negation-char-face ((t (:foreground "#09F7A0"))))
  '(font-lock-preprocessor-face ((t (:foreground "#25B2BC" :slant italic))))
  '(font-lock-regexp-grouping-backslash ((t (:foreground "#24A8B4" :weight bold))))
  '(font-lock-regexp-grouping-construct ((t (:foreground "#24A8B4" :weight bold))))
@@ -90,6 +93,8 @@
  '(font-lock-type-face ((t (:foreground "#EFB993" :weight bold))))
  '(font-lock-variable-name-face ((t (:foreground "#E93C58" :weight bold))))
  '(font-lock-warning-face ((t (:foreground "#E93C58" :weight bold))))
+ '(header-line ((t (:inherit mode-line :foreground "#B072D1"))))
+ '(hi-red-b ((t (:foreground "#E93C58" :weight bold))))
  '(highlight ((t (:background "#6F6F70" :underline t))))
  '(info-xref ((t (:foreground "#25B2BC" :weight bold))))
  '(isearch ((t (:background "#6F6F70" :foreground "#FAB28E" :inverse-video t))))
@@ -118,12 +123,17 @@
  '(lsp-ui-peek-selection ((t (:background "#2E303E"))))
  '(lsp-ui-sideline-code-action ((t (:foreground "#FAC29A"))))
  '(lsp-ui-sideline-current-symbol ((t (:box (:line-width -1 :color "#CBCED0") :weight ultra-bold :height 0.99))))
+ '(magit-branch-remote ((t (:foreground "#09F7A0" :weight bold))))
+ '(magit-cherry-equivalent ((t (:foreground "#B072D1"))))
  '(magit-diff-added ((t (:background "#27D796"))))
  '(magit-diff-added-highlight ((t (:background "#27D796"))))
  '(magit-diff-removed ((t (:background "#E9436F"))))
  '(magit-diff-removed-highlight ((t (:background "#E9436F"))))
  '(magit-diffstat-added ((t (:foreground "#27D796"))))
  '(magit-diffstat-removed ((t (:foreground "#E9436F"))))
+ '(magit-hash ((t (:foreground "#26BBD9"))))
+ '(magit-signature-error ((t (:foreground "#E93C58"))))
+ '(markdown-link-face ((t (:foreground "#24A8B4" :underline t))))
  '(match ((t (:foreground "#25B2BC" :inverse-video t))))
  '(minibuffer-prompt ((t (:foreground "#25B2BC" :weight bold))))
  '(mode-line ((t (:background "#232530" :foreground "#9DA0A2" :inverse-video nil :box nil :height 0.9))))
@@ -133,6 +143,7 @@
  '(org-document-info ((t (:foreground "#25B2BC"))))
  '(org-document-info-keyword ((t (:foreground "#09F7A0"))))
  '(org-document-title ((t (:foreground "#CBCED0" :weight bold :height 1.44))))
+ '(org-warning ((t (:foreground "#E4A382" :weight bold))))
  '(region ((t (:background "#2E303E"))))
  '(show-paren-match ((t (:background "#25B2BC"))))
  '(sml/charging ((t (:inherit sml/global :foreground "#27D796"))))
@@ -145,8 +156,13 @@
  '(sml/read-only ((t (:inherit (font-lock-type-face sml/not-modified) :foreground "#24A8B4"))))
  '(success ((t (:foreground "#09F7A0" :weight bold))))
  '(tooltip ((t (:inherit default :background "#6C6F93"))))
- '(vertical-border ((t (:background "#1C1E26" :foreground "#6F6F70"))))
- '(whitespace-line ((t (:background "red" :foreground "black")))))
+ '(vertical-border ((t (:background "#1C1E26" :foreground "#232530"))))
+ '(warning ((t (:foreground "#E4A382" :weight bold))))
+ '(web-mode-error-face ((t (:background "#E93C58"))))
+ '(whitespace-big-indent ((t (:background "#E93C58"))))
+ '(whitespace-line ((t (:background "#E93C58" :foreground "#1C1E26"))))
+ '(whitespace-trailing ((t (:background "#E93C58" :foreground "#EFB993"))))
+ '(yaml-tab-face ((t (:background "#E93C58" :foreground "#E93C58" :weight bold)))))
 
 (show-paren-mode 1)