Browse Source

Changed theme

pull/2/head
Josh Wolfe 6 years ago
parent
commit
a086b375d2
  1. 72
      .emacs.d/README.org
  2. 366
      .emacs.d/themes/prassee-theme.el

72
.emacs.d/README.org

@ -32,7 +32,7 @@ Have use-package auto download @@ -32,7 +32,7 @@ Have use-package auto download
#+END_SRC
* Startup
Runs a different function on startup depending on display mode.
#+BEGIN_SRC emacs-lisp :tangle yes
@ -53,31 +53,51 @@ Runs a different function on startup depending on display mode. @@ -53,31 +53,51 @@ Runs a different function on startup depending on display mode.
#+END_SRC
#+BEGIN_SRC emacs-lisp :tangle yes
(defun wolfe/gui-setup ()
(use-package solarized-theme
:config
(load-theme 'solarized-dark t))
(set-frame-size (selected-frame) 90 40)
(custom-set-faces
'(org-todo ((t (:box (:line-width 1)))))
'(org-done ((t (:box (:line-width 1))))))
;; For old jazz theme
;;(custom-set-faces
;; '(helm-ff-directory ((t (:background nil :foreground "DarkRed"))))
;; '(helm-ff-file ((t :foreground "#ffffff")))
;; '(column-marker-1 ((t (:background "#ff0000"))))
;; '(iedit-occurrence ((t (:background "#00bfff"))))
;; '(isearch ((t (:foreground "#ff0000"))))
;; '(lazy-highlight ((t (:foreground "#ff0000" :background nil))))
;; '(linum ((t (:foreground "#ffffff")))))
)
;; Not a function but it needs to be after the 2 setup functions
(if (display-graphic-p)
(wolfe/gui-setup)
(wolfe/term-setup))
(defun wolfe/gui-setup ()
;;(use-package solarized-theme
;; :config
;; (load-theme 'solarized-dark t))
;;(set-frame-size (selected-frame) 90 40)
(load-theme 'prassee t)
(use-package spaceline
:init
(progn
(require 'spaceline-config)
(setq powerline-default-separator 'slant)
(setq spaceline-workspace-numbers-unicode t)
(setq spaceline-separator-dir-left '(left . left))
(setq spaceline-separator-dir-right '(right . right))
(setq powerline-height 27)
(spaceline-toggle-window-number-on)
(spaceline-toggle-buffer-modified-on)
(spaceline-toggle-major-mode-on)
(spaceline-toggle-battery-on)
(spaceline-toggle-hud-on)
(spaceline-toggle-projectile-root-on)
(spaceline-emacs-theme)))
(custom-set-faces
'(org-todo ((t (:box (:line-width 1)))))
'(org-done ((t (:box (:line-width 1)))))
'(org-level-1 ((t (:background "#23272e" :foreground "#51afef" :height 1.4))))
'(org-todo ((t (:foreground "#ECBE7B" :box 1 :weight bold :height 1.15)))))
;; For old jazz theme
;;(custom-set-faces
;; '(helm-ff-directory ((t (:background nil :foreground "DarkRed"))))
;; '(helm-ff-file ((t :foreground "#ffffff")))
;; '(column-marker-1 ((t (:background "#ff0000"))))
;; '(iedit-occurrence ((t (:background "#00bfff"))))
;; '(isearch ((t (:foreground "#ff0000"))))
;; '(lazy-highlight ((t (:foreground "#ff0000" :background nil))))
;; '(linum ((t (:foreground "#ffffff")))))
)
;; Not a function but it needs to be after the 2 setup functions
(if (display-graphic-p)
(wolfe/gui-setup)
(wolfe/term-setup))
#+END_SRC
* General Settings

366
.emacs.d/themes/prassee-theme.el

@ -0,0 +1,366 @@ @@ -0,0 +1,366 @@
;; Inspired from Doom-theme with some customization
(deftheme prassee
"A dark theme inspired by Doom One theme")
(let ((c '((class color) (min-colors 89)))
(black "#181e26")
(white "#DFDFDF")
(grey (if window-system "#5B6268" "#525252"))
(green-c "#65737E")
(grey-c "#3d4451")
(grey-d "#3D3D48")
(grey-dd "#404850")
(yellow "#ECBE7B")
(yellow-d "#CDB464")
(orange "#da8548")
(red "#ff6c6b")
(magenta "#c678dd")
(violet "#a9a1e1")
(cyan "#46D9FF")
(cyan-d "#5699AF")
(teal "#4db5bd")
(blue "#51afef")
(blue-d "#1f5582")
(green "#98be65"))
(let* ((bg "#2b303b")
(bg-d "#2b303b")
(fg "#bbc2cf")
(highlight blue)
(vertical-bar black)
(current-line (if window-system "#23272e" "#262626"))
(selection highlight)
(builtin magenta)
(comments green-c)
(constants violet)
(functions magenta)
(keywords blue)
(methods cyan)
(operators blue)
(type yellow)
(strings green)
(variables white)
(numbers orange)
(region "#3d4451")
;; tabs
(tab-unfocused-bg "#353a42")
(tab-unfocused-fg "#1e2022")
;; main search regions
(search-bg blue)
(search-fg black)
;; other search regions
(search-rest-bg grey-d)
(search-rest-fg blue)
;; mode line
(modeline-fg grey)
(modeline-fg-l blue)
(modeline-bg (if window-system bg-d current-line))
(modeline-bg-l (if window-system blue current-line))
(modeline-fg-inactive white)
(modeline-bg-inactive grey)
;; vcs
(vc-modified yellow-d)
(vc-added green)
(vc-deleted red))
(custom-theme-set-faces
'prassee
;; Global
`(default ((,c (:background ,bg-d :foreground ,fg))))
`(fringe ((,c (:inherit default :foreground ,comments))))
`(region ((,c (:background ,region))))
`(highlight ((,c (:background ,blue :foreground ,black))))
`(hl-line ((,c (:background ,bg))))
`(cursor ((,c (:background ,blue))))
`(shadow ((,c (:foreground ,grey))))
`(minibuffer-prompt ((,c (:foreground ,blue))))
`(tooltip ((,c (:background ,black :foreground ,fg))))
`(error ((,c (:foreground ,orange))))
`(warning ((,c (:foreground ,yellow))))
`(success ((,c (:foreground ,green))))
`(secondary-selection ((,c (:background ,blue :foreground ,black))))
`(lazy-highlight ((,c (:background ,blue-d :foreground ,white))))
`(match ((,c (:foreground ,green :background ,black ))))
`(trailing-whitespace ((,c (:background ,comments))))
`(vertical-border ((,c (:foreground ,vertical-bar :background ,vertical-bar))))
`(show-paren-match ((,c (:foreground ,red :background ,black ))))
`(show-paren-mismatch ((,c (:foreground ,black :background ,red ))))
`(linum
((((type graphic)) :background ,bg :foreground ,teal )
(t :background ,bg :foreground ,teal )))
`(font-lock-builtin-face ((,c (:foreground ,builtin))))
`(font-lock-comment-face ((,c (:foreground ,comments))))
`(font-lock-comment-delimiter-face ((,c (:foreground ,comments))))
`(font-lock-doc-face ((,c (:foreground ,comments))))
`(font-lock-doc-string-face ((,c (:foreground ,comments))))
`(font-lock-constant-face ((,c (:foreground ,constants))))
`(font-lock-function-name-face ((,c (:foreground ,functions))))
`(font-lock-keyword-face ((,c (:foreground ,keywords))))
`(font-lock-string-face ((,c (:foreground ,strings))))
`(font-lock-type-face ((,c (:foreground ,type))))
`(font-lock-variable-name-face ((,c (:foreground ,variables))))
`(font-lock-warning-face ((,c (:inherit warning))))
`(font-lock-negation-char-face ((,c (:foreground ,operators ))))
`(font-lock-preprocessor-face ((,c (:foreground ,operators ))))
`(font-lock-preprocessor-char-face ((,c (:foreground ,operators ))))
`(font-lock-regexp-grouping-backslash ((,c (:foreground ,operators ))))
`(font-lock-regexp-grouping-construct ((,c (:foreground ,operators ))))
;; Modeline
`(mode-line ((,c (:foreground ,black
:background ,teal))))
`(mode-line-inactive ((,c (:foreground ,green
:background ,green-c))))
`(header-line ((,c (:inherit mode-line))))
;; Powerline/Spaceline
;;`(spaceline-highlight-face ((,c (:foreground ,black))))
`(powerline-active1 ((,c (:inherit mode-line))))
`(powerline-active2 ((,c (:inherit mode-line))))
`(powerline-inactive1 ((,c (:inherit mode-line-inactive))))
`(powerline-inactive2 ((,c (:inherit mode-line-inactive))))
;; Dired/dired-k
`(dired-directory ((,c (:foreground ,orange))))
`(dired-ignored ((,c (:foreground ,comments))))
`(dired-k-directory ((,c (:foreground ,blue))))
;; Search
`(isearch ((,c (:background ,search-bg :foreground ,black ))))
`(isearch-lazy-highlight-face ((,c (:background ,search-rest-bg))))
`(yas-field-highlight-face ((,c (:inherit match))))
;; `window-divider'
`(window-divider ((,c (:foreground ,vertical-bar))))
`(window-divider-first-pixel ((,c (:foreground ,vertical-bar))))
`(window-divider-last-pixel ((,c (:foreground ,vertical-bar))))
;;
;; Plugins
;;
;; Avy
`(avy-lead-face-0 ((,c (:background ,search-bg :foreground ,search-fg))))
`(avy-lead-face-1 ((,c (:background ,search-bg :foreground ,search-fg))))
`(avy-lead-face-2 ((,c (:background ,search-bg :foreground ,search-fg))))
`(avy-lead-face ((,c (:background ,search-bg :foreground ,search-fg))))
;; company-mode
`(company-tooltip ((,c (:inherit tooltip))))
`(company-tooltip-common ((,c (:foreground ,blue))))
`(company-tooltip-search ((,c (:foreground ,search-fg :background ,highlight))))
`(company-tooltip-selection ((,c (:background ,selection))))
`(company-tooltip-mouse ((,c (:background ,magenta :foreground ,bg))))
`(company-tooltip-annotation ((,c (:foreground ,violet))))
`(company-scrollbar-bg ((,c (:background ,black))))
`(company-scrollbar-fg ((,c (:background ,blue))))
`(company-preview ((,c (:foreground ,blue))))
`(company-preview-common ((,c (:foreground ,magenta :background ,grey-d))))
`(company-preview-search ((,c (:inherit company-tooltip-search))))
;; diff-hl
`(diff-hl-change ((,c (:foreground ,vc-modified))))
`(diff-hl-delete ((,c (:foreground ,vc-deleted))))
`(diff-hl-insert ((,c (:foreground ,vc-added))))
;; elscreen
`(elscreen-tab-background-face ((,c (:background ,bg-d))))
`(elscreen-tab-control-face ((,c (:background ,bg-d :foreground ,bg-d))))
`(elscreen-tab-current-screen-face ((,c (:background ,bg :foreground ,fg))))
`(elscreen-tab-other-screen-face ((,c (:background ,tab-unfocused-bg :foreground ,tab-unfocused-fg))))
;; flycheck
`(flycheck-error ((,c (:underline (:style wave :color ,red)))))
`(flycheck-warning ((,c (:underline (:style wave :color ,yellow)))))
`(flycheck-info ((,c (:underline (:style wave :color ,green)))))
`(flyspell-incorrect ((,c (:underline (:style wave :color ,red) :inherit unspecified))))
;; git-gutter
`(git-gutter:modified ((,c (:foreground ,vc-modified))))
`(git-gutter:added ((,c (:foreground ,vc-added))))
`(git-gutter:deleted ((,c (:foreground ,vc-deleted))))
`(git-gutter-fr:modified ((,c (:foreground ,vc-modified))))
`(git-gutter-fr:added ((,c (:foreground ,vc-added))))
`(git-gutter-fr:deleted ((,c (:foreground ,vc-deleted))))
`(git-gutter+-modified ((,c (:foreground ,vc-modified))))
`(git-gutter+-added ((,c (:foreground ,vc-added))))
`(git-gutter+-deleted ((,c (:foreground ,vc-deleted))))
;; Helm
`(helm-selection ((,c (:background ,teal :foreground ,black))))
`(helm-match ((,c (:foreground ,blue :underline t))))
`(helm-source-header ((,c (:background ,highlight :foreground ,black ))))
`(helm-swoop-target-line-face ((,c (:foreground ,highlight :inverse-video t))))
`(helm-ff-file ((,c (:foreground ,fg))))
`(helm-ff-prefix ((,c (:foreground ,magenta))))
`(helm-ff-dotted-directory ((,c (:foreground ,grey-d))))
`(helm-ff-directory ((,c (:foreground ,orange))))
`(helm-ff-executable ((,c (:foreground ,white ))))
;; indent-guide, highlight-{quoted,numbers,indentation}-mode
`(indent-guide-face ((,c (:foreground "#2F2F38"))))
`(highlight-indentation-face ((,c (:background "#222830"))))
`(highlight-indentation-current-column-face ((,c (:background "#222830"))))
`(highlight-indentation-guides-odd-face ((,c (:background ,bg))))
`(highlight-indentation-guides-even-face ((,c (:background "#222830"))))
`(highlight-quoted-symbol ((,c (:foreground ,type))))
`(highlight-quoted-quote ((,c (:foreground ,operators))))
`(highlight-numbers-number ((,c (:foreground ,numbers))))
;; neotree
`(neo-root-dir-face ((,c (:foreground ,green :background ,bg :box (:line-width 4 :color ,bg)))))
`(neo-file-link-face ((,c (:foreground ,fg))))
`(neo-dir-link-face ((,c (:foreground ,blue))))
`(neo-expand-btn-face ((,c (:foreground ,blue))))
;; pos-tip
`(popup ((,c (:inherit tooltip))))
`(popup-tip-face ((,c (:inherit tooltip))))
;; stripe-buffer
`(stripe-highlight ((,c (:background ,bg))))
;; Volatile highlights
`(vhl/default-face ((,c (:background ,grey-d))))
;; Rainbow delimiters
`(rainbow-delimiters-depth-1-face ((,c (:foreground ,blue))))
`(rainbow-delimiters-depth-2-face ((,c (:foreground ,magenta))))
`(rainbow-delimiters-depth-3-face ((,c (:foreground ,green))))
`(rainbow-delimiters-depth-4-face ((,c (:foreground ,orange))))
`(rainbow-delimiters-depth-5-face ((,c (:foreground ,violet))))
;; re-builder
`(reb-match-0 ((,c (:foreground ,orange :inverse-video t))))
`(reb-match-1 ((,c (:foreground ,magenta :inverse-video t))))
`(reb-match-2 ((,c (:foreground ,green :inverse-video t))))
`(reb-match-3 ((,c (:foreground ,yellow :inverse-video t))))
;; which-key
`(which-key-key-face ((,c (:foreground ,green))))
`(which-key-group-description-face ((,c (:foreground ,violet))))
`(which-key-command-description-face ((,c (:foreground ,blue))))
`(which-key-local-map-description-face ((,c (:foreground ,magenta))))
;; whitespace
`(whitespace-tab ((,c (:foreground ,grey-d))))
`(whitespace-newline ((,c (:foreground ,grey-d))))
`(whitespace-trailing ((,c (:background ,grey-d))))
`(whitespace-line ((,c (:background ,current-line :foreground ,magenta))))
;; workgroups2
`(wg-current-workgroup-face ((,c (:foreground ,black :background ,blue))))
`(wg-other-workgroup-face ((,c (:foreground ,grey :background ,current-line))))
`(wg-divider-face ((,c (:foreground ,grey-d))))
`(wg-brace-face ((,c (:foreground ,blue))))
;;
;; Language-specific
;;
;; ensime , Scala & SBT
`(scala-font-lock:var-face ((t (:foreground ,fg :underline (:style wave :color "yellow") :inherit 'font-lock-variable-name-face))))
`(sbt:error ((t (:inherit 'default :foreground ,red))))
`(ensime-warnline-highlight ((t (:inherit 'font-lock-warning-face))))
`(ensime-compile-infoline ((t (:foreground ,fg ))))
;;; (css|scss)-mode
`(css-proprietary-property ((,c (:foreground ,orange))))
`(css-property ((,c (:foreground ,green))))
`(css-selector ((,c (:foreground ,blue))))
;;; js2-mode
`(js2-function-param ((,c (:foreground ,variables))))
`(js2-function-call ((,c (:foreground ,functions))))
`(js2-object-property ((,c (:foreground ,violet))))
`(js2-jsdoc-tag ((,c (:foreground ,comments))))
;;; makefile-*-mode
`(makefile-targets ((,c (:foreground ,blue))))
;;; markdown-mode
`(markdown-header-face ((,c (:foreground ,red :bold t))))
`(markdown-header-delimiter-face ((,c (:inherit markdown-header-face))))
`(markdown-metadata-key-face ((,c (:foreground ,red))))
`(markdown-blockquote-face ((,c (:foreground ,violet))))
`(markdown-markup-face ((,c (:foreground ,grey))))
`(markdown-markup-face ((,c (:foreground ,operators))))
`(markdown-pre-face ((,c (:foreground ,green))))
`(markdown-inline-face ((,c (:foreground ,cyan))))
`(markdown-list-face ((,c (:foreground ,red))))
`(markdown-link-face ((,c (:foreground ,blue :bold t))))
`(markdown-url-face ((,c (:foreground ,magenta :bold t))))
`(markdown-header-face-1 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-2 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-3 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-4 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-5 ((,c (:inherit markdown-header-face))))
`(markdown-header-face-6 ((,c (:inherit markdown-header-face))))
`(markdown-header-rule-face ((,c (:inherit shadow))))
`(markdown-italic-face ((,c (:inherit italic :foreground ,violet))))
`(markdown-bold-face ((,c (:inherit bold :foreground ,orange))))
`(markdown-link-face ((,c (:inherit shadow))))
`(markdown-link-title-face ((,c (:inherit link))))
`(markdown-url-face ((,c (:inherit link))))
;; org-mode
`(org-tag ((,c (:foreground ,yellow :bold t))))
`(org-priority ((,c (:foreground ,red))))
`(org-ellipsis ((,c (:inherit hs-face))))
`(org-hide ((,c (:foreground ,bg))))
`(org-table ((,c (:foreground ,cyan))))
`(org-quote ((,c (:slant italic :foreground ,grey :background ,current-line))))
`(org-document-info ((,c (:foreground ,orange))))
`(org-document-info-keyword ((,c (:foreground ,grey-d))))
`(org-meta-line ((,c (:foreground ,comments))))
`(org-block-begin-line ((,c (:background ,current-line :foreground ,comments))))
`(org-block-end-line ((,c (:inherit org-block-begin-line))))
`(org-block-background ((,c (:background ,current-line))))
`(org-archived ((,c (:foreground ,grey))))
`(org-document-title ((,c (:foreground ,cyan :height 1.2))))
`(org-level-1 ((,c (:background ,current-line :foreground ,blue :height 1.2))))
`(org-level-2 ((,c ( :foreground ,blue))))
`(org-level-3 ((,c ( :foreground ,blue))))
`(org-level-4 ((,c ( :foreground ,blue))))
`(org-level-5 ((,c ( :foreground ,blue))))
`(org-level-6 ((,c ( :foreground ,blue))))
`(org-code ((,c (:foreground ,orange))))
`(org-verbatim ((,c (:foreground ,green))))
`(org-formula ((,c (:foreground ,cyan))))
`(org-list-dt ((,c (:foreground ,cyan))))
`(org-footnote ((,c (:foreground ,orange))))
`(org-link ((,c (:foreground ,cyan :underline t))))
`(org-date ((,c (:foreground ,violet))))
`(org-todo ((,c (:foreground ,yellow :bold inherit))))
`(org-done ((,c (:foreground ,green :bold inherit))))
`(org-headline-done ((,c (:foreground ,grey :bold t :strike-through t))))
`(org-special-keyword ((,c (:foreground ,magenta))))
`(org-checkbox ((,c (:inherit org-todo))))
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
`(org-list-bullet ((,c (:foreground ,cyan)))) ; custom
`(message-header-name ((,c (:foreground ,green)))) ; custom
;;; typescript-mode
`(ts-object-property ((,c (:inherit js2-object-property))))
;;; web-mode
`(web-mode-doctype-face ((,c (:foreground ,comments))))
`(web-mode-html-tag-face ((,c (:foreground ,methods))))
`(web-mode-html-tag-bracket-face ((,c (:foreground ,methods))))
`(web-mode-html-attr-name-face ((,c (:foreground ,type))))
`(web-mode-html-entity-face ((,c (:foreground ,cyan ))))
`(web-mode-block-control-face ((,c (:foreground ,orange))))
;;`(web-mode-html-tag-bracket-face ((,c (:foreground ,operators))))
)))
(provide-theme 'prassee)
Loading…
Cancel
Save