emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

No NARF, only DOOM

Browse source
This commit is contained in:
Henrik Lissner 2016-05-20 22:37:30 -04:00
parent a984bf4f26
commit ad225d2591
104 changed files with 1404 additions and 1409 deletions
Download patch file Download diff file Expand all files Collapse all files

110
private/themes/narf-dark-theme.el → private/themes/doom-dark-theme.el
View file

@ -1,28 +1,7 @@
;; NARF Dark
;; DOOM Dark
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
(require 'dash)
(deftheme narf-dark "A dark theme for narfy emacs, inspired by Molokai")
;; Color helper functions
;; Shamelessly *borrowed* from solarized
(defun --color-name-to-rgb (color &optional frame)
(let ((valmax (float (car (color-values "#ffffff")))))
(mapcar (lambda (x) (/ x valmax)) (color-values color frame))))
(defun --color-rgb-to-hex (red green blue)
(format "#%02x%02x%02x"
(* red 255) (* green 255) (* blue 255)))
(defun --color-blend (color1 color2 alpha)
(apply '--color-rgb-to-hex
(-zip-with '(lambda (it other)
(+ (* alpha it) (* other (- 1 alpha))))
(--color-name-to-rgb color1)
(--color-name-to-rgb color2))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftheme doom-dark "A dark theme for hellish emacs, inspired by Molokai")
(let* ((c '((class color)))
@ -99,7 +78,7 @@
(vc-deleted red))
(custom-theme-set-faces
'narf-dark
'doom-dark
;; Text
`(default ((,c (:foreground ,fg :background ,bg))))
@ -122,7 +101,7 @@
`(flycheck-warning ((,c (:underline (:style wave :color ,yellow) :background ,grey-2))))
`(flycheck-info ((,c (:underline (:style wave :color ,green) :background ,grey-2))))
`(flyspell-incorrect ((,c (:underline (:style wave :color ,error-highlight)
:inherit unspecified))))
:inherit unspecified))))
`(hs-face ((,c (:foreground ,comments :background ,black))))
`(hs-fringe-face ((,c (:foreground ,orange))))
@ -160,7 +139,7 @@
`(show-paren-match ((,c (:foreground ,magenta :inverse-video t))))
;; Modeline
`(narf-minibuffer-active ((,c (:background ,active-minibuffer))))
`(doom-minibuffer-active ((,c (:background ,active-minibuffer))))
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
@ -182,9 +161,9 @@
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
`(narf-todo-face ((,c (:foreground ,yellow))))
`(narf-fixme-face ((,c (:foreground ,red))))
`(narf-note-face ((,c (:foreground ,cyan))))
`(doom-todo-face ((,c (:foreground ,yellow))))
`(doom-fixme-face ((,c (:foreground ,red))))
`(doom-note-face ((,c (:foreground ,cyan))))
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold ,bold))))
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
@ -368,7 +347,7 @@
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
;; NARF custom org faces
;; DOOM custom org faces
`(org-headline-todo ((,c (:bold nil))))
`(org-block ((,c (:background ,current-line))))
`(org-block-background ((,c (:background ,current-line))))
@ -379,36 +358,55 @@
`(org-todo-checkbox ((,c (:inherit variable-pitch))))
)
;; *****************************************************************************************
;; *****************************************************************************************
(custom-theme-set-variables
'narf-dark
`(vc-annotate-color-map
'((20 . ,green)
(40 . ,(--color-blend yellow green (/ 1.0 3)))
(60 . ,(--color-blend yellow green (/ 2.0 3)))
(80 . ,yellow)
(100 . ,(--color-blend orange yellow (/ 1.0 3)))
(120 . ,(--color-blend orange yellow (/ 2.0 3)))
(140 . ,orange)
(160 . ,(--color-blend magenta orange (/ 1.0 3)))
(180 . ,(--color-blend magenta orange (/ 2.0 3)))
(200 . ,magenta)
(220 . ,(--color-blend red magenta (/ 1.0 3)))
(240 . ,(--color-blend red magenta (/ 2.0 3)))
(260 . ,red)
(280 . ,(--color-blend grey-2 red (/ 1.0 4)))
(300 . ,(--color-blend grey-2 red (/ 2.0 4)))
(320 . ,(--color-blend grey-2 red (/ 3.0 4)))
(340 . ,grey-2)
(360 . ,grey-2)))
`(vc-annotate-very-old-color nil)
`(vc-annotate-background ,black))
)
(after! vc-annotate
(require 'dash)
;; Color helper functions
;; Shamelessly *borrowed* from solarized
(defun --color-name-to-rgb (color &optional frame)
(let ((valmax (float (car (color-values "#ffffff")))))
(mapcar (lambda (x) (/ x valmax)) (color-values color frame))))
(defun --color-rgb-to-hex (red green blue)
(format "#%02x%02x%02x"
(* red 255) (* green 255) (* blue 255)))
(defun --color-blend (color1 color2 alpha)
(apply '--color-rgb-to-hex
(-zip-with '(lambda (it other)
(+ (* alpha it) (* other (- 1 alpha))))
(--color-name-to-rgb color1)
(--color-name-to-rgb color2))))
(custom-theme-set-variables
'doom-dark
`(vc-annotate-color-map
'((20 . ,green)
(40 . ,(--color-blend yellow green (/ 1.0 3)))
(60 . ,(--color-blend yellow green (/ 2.0 3)))
(80 . ,yellow)
(100 . ,(--color-blend orange yellow (/ 1.0 3)))
(120 . ,(--color-blend orange yellow (/ 2.0 3)))
(140 . ,orange)
(160 . ,(--color-blend magenta orange (/ 1.0 3)))
(180 . ,(--color-blend magenta orange (/ 2.0 3)))
(200 . ,magenta)
(220 . ,(--color-blend red magenta (/ 1.0 3)))
(240 . ,(--color-blend red magenta (/ 2.0 3)))
(260 . ,red)
(280 . ,(--color-blend grey-2 red (/ 1.0 4)))
(300 . ,(--color-blend grey-2 red (/ 2.0 4)))
(320 . ,(--color-blend grey-2 red (/ 3.0 4)))
(340 . ,grey-2)
(360 . ,grey-2)))
`(vc-annotate-very-old-color nil)
`(vc-annotate-background ,black))))
;; *****************************************************************************************
(provide-theme 'narf-dark)
(provide-theme 'doom-dark)
;; Local Variables:
;; no-byte-compile: t

16
private/themes/narf-light-theme.el → private/themes/doom-light-theme.el
View file

@ -1,7 +1,7 @@
;; NARF Dark
;; DOOM Light
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
(deftheme narf-light "A light theme for narfy emacs, inspired by Base 16")
(deftheme doom-light "A light theme for hellish emacs, inspired by Base 16")
(let* ((c '((class color)))
@ -90,7 +90,7 @@
(vc-deleted orange))
(custom-theme-set-faces
'narf-light
'doom-light
;; Text
`(default ((,c (:foreground ,fg :background ,bg))))
@ -169,9 +169,9 @@
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
`(narf-todo-face ((,c (:foreground ,yellow :bold t))))
`(narf-fixme-face ((,c (:foreground ,red :bold t))))
`(narf-note-face ((,c (:foreground ,cyan :bold t))))
`(doom-todo-face ((,c (:foreground ,yellow :bold t))))
`(doom-fixme-face ((,c (:foreground ,red :bold t))))
`(doom-note-face ((,c (:foreground ,cyan :bold t))))
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold t))))
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
@ -316,7 +316,7 @@
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
;; NARF custom org faces
;; DOOM custom org faces
`(org-headline-todo ((,c (:foreground ,dark-cyan :bold nil))))
`(org-block ((,c (:background ,current-line))))
`(org-block-background ((,c (:background ,current-line))))
@ -331,7 +331,7 @@
;; *****************************************************************************************
(provide-theme 'narf-light)
(provide-theme 'doom-light)
;; Local Variables:
;; no-byte-compile: t

40
private/themes/narf-one-theme.el → private/themes/doom-one-theme.el
View file

@ -1,25 +1,25 @@
;; NARF One Dark (inspired by Atom)
;; DOOM One Dark (inspired by Atom)
;; By Henrik Lissner <http://github.com/hlissner/emacs.d>
(deftheme narf-one "A dark theme for narfy emacs, inspired by Molokai")
(deftheme doom-one "A dark theme for hellish emacs, inspired by Molokai")
(when (display-graphic-p)
;; Brighten up code buffers; darken special and popup buffers
(defface narf-default '((t (:inherit default)))
(defface doom-default '((t (:inherit default)))
"Face for source code windows")
(defun narf|buffer-bg (&rest _)
(defun doom|buffer-bg (&rest _)
(set (make-local-variable 'face-remapping-alist)
'((default narf-default)
(linum narf-linum))))
(add-hook 'find-file-hook 'narf|buffer-bg)
'((default doom-default)
(linum doom-linum))))
(add-hook 'find-file-hook 'doom|buffer-bg)
;; Brighter minibuffer when active + no fringe in minibuffer
(defface narf-minibuffer-active '((t (:inherit mode-line)))
(defface doom-minibuffer-active '((t (:inherit mode-line)))
"Face for active minibuffer")
(add-hook! minibuffer-setup
(set-window-fringes (minibuffer-window) 0 0 nil)
(set (make-local-variable 'face-remapping-alist)
'((default narf-minibuffer-active)))))
'((default doom-minibuffer-active)))))
(let* ((c '((class color)))
@ -98,12 +98,12 @@
(vc-deleted red))
(custom-theme-set-faces
'narf-one
'doom-one
;; Text
`(default ((,c (:foreground ,fg :background ,bg-d))))
`(narf-default ((,c (:inherit default :background ,bg))))
`(fringe ((,c (:inherit narf-default :foreground ,comments))))
`(doom-default ((,c (:inherit default :background ,bg))))
`(fringe ((,c (:inherit doom-default :foreground ,comments))))
`(cursor ((,c (:background ,white))))
`(hl-line ((,c (:background ,current-line))))
`(region ((,c (:background ,selection :foreground ,white))))
@ -156,12 +156,12 @@
`(vertical-border ((,c (:foreground ,vertical-bar :background ,vertical-bar))))
`(linum ((,c (:foreground ,linum-fg :background ,bg-d :bold nil))))
`(narf-linum ((,c (:inherit linum :background ,bg))))
`(doom-linum ((,c (:inherit linum :background ,bg))))
`(linum-highlight-face ((,c (:inherit linum :foreground ,linum-hl-fg :background ,current-line))))
`(show-paren-match ((,c (:foreground ,magenta :inverse-video t))))
;; Modeline
`(narf-minibuffer-active ((,c (:background ,bg))))
`(doom-minibuffer-active ((,c (:background ,bg))))
`(mode-line ((,c (:foreground ,modeline-fg :background ,modeline-bg))))
`(mode-line-inactive ((,c (:foreground ,modeline-fg-inactive :background ,modeline-bg-inactive))))
@ -183,9 +183,9 @@
`(isearch ((,c (:foreground ,search-fg :background ,search-bg))))
`(isearch-lazy-highlight-face ((,c (:foreground ,search-rest-fg :background ,search-rest-bg))))
`(narf-todo-face ((,c (:foreground ,yellow))))
`(narf-fixme-face ((,c (:foreground ,red))))
`(narf-note-face ((,c (:foreground ,cyan))))
`(doom-todo-face ((,c (:foreground ,yellow))))
`(doom-fixme-face ((,c (:foreground ,red))))
`(doom-note-face ((,c (:foreground ,cyan))))
`(evil-ex-substitute-replacement ((,c (:foreground ,magenta :background ,black :bold ,bold))))
`(evil-search-highlight-persist-highlight-face ((,c (:background ,search-rest-bg))))
@ -364,7 +364,7 @@
`(org-checkbox-statistics-todo ((,c (:inherit org-todo))))
`(org-checkbox-statistics-done ((,c (:inherit org-done))))
;; NARF custom org faces
;; DOOM custom org faces
`(org-headline-todo ((,c (:bold nil))))
`(org-block ((,c (:background ,current-line))))
`(org-block-background ((,c (:background ,current-line))))
@ -398,7 +398,7 @@
(--color-name-to-rgb color2))))
(custom-theme-set-variables
'narf-one
'doom-one
`(vc-annotate-color-map
'((20 . ,green)
(40 . ,(--color-blend yellow green (/ 1.0 3)))
@ -423,7 +423,7 @@
;; *****************************************************************************************
(provide-theme 'narf-one)
(provide-theme 'doom-one)
;; Local Variables:
;; no-byte-compile: t