From dd775b246e94859edc0551d36b6f2f6c25225543 Mon Sep 17 00:00:00 2001 From: Kaden Barlow Date: Thu, 27 Feb 2020 21:35:28 -0700 Subject: [PATCH 1/3] adds doom-monokai-pro --- README.md | 2 + themes/doom-monokai-pro-theme.el | 111 +++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 themes/doom-monokai-pro-theme.el diff --git a/README.md b/README.md index 90400d70..3604c8cf 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ DOOM Themes is an opinionated UI plugin and pack of themes extracted from my - [X] `doom-material` adapted from [Material Themes] (thanks to [tam5]) - [X] `doom-manegarm`: an original autumn-inspired dark theme (thanks to [kenranunderscore]) - [X] `doom-molokai`: based on Textmate's monokai + - [ ] `doom-monokai-pro`: based off of Monokai Pro (thanks to [kadenbarlow]) - [X] `doom-moonlight` ported from VS Code's [Moonlight Theme] (thanks to [Brettm12345]) - [X] `doom-nord`: dark variant of [Nord][nord] (thanks to [fuxialexander]) - [X] `doom-nord-light`: light variant of [Nord][nord] (thanks to [fuxialexander]) @@ -201,6 +202,7 @@ pointers. Additional theme and plugin support requests are welcome too. [juanwolf]: https://github.com/juanwolf [JongW]: https://github.com/JongW [jwintz]: https://github.com/jwintz +[kadenbarlow]: https://github.com/kadenbarlow [karetsu]: https://github.com/kenranunderscore [kenranunderscore]: https://github.com/kenranunderscore [Material Themes]: https://github.com/equinusocio/vsc-material-theme diff --git a/themes/doom-monokai-pro-theme.el b/themes/doom-monokai-pro-theme.el new file mode 100644 index 00000000..b94c0698 --- /dev/null +++ b/themes/doom-monokai-pro-theme.el @@ -0,0 +1,111 @@ +;; doom-monokai-pro-theme.el --- based off of Monokai Pro -*- no-byte-compile: t; -*- +(require 'doom-themes) + +(defgroup doom-monokai-pro-theme nil + "Options for doom-themes" + :group 'doom-themes) + +(defcustom doom-monokai-pro-padded-modeline doom-themes-padded-modeline + "If non-nil, adds a 4px padding to the mode-line. +Can be an integer to determine the exact padding." + :group 'doom-monokai-pro-theme + :type '(choice integer boolean)) + +(def-doom-theme doom-monokai-pro + "A theme based off of Monokai Pro" + + ;; name gui 256 16 + ((bg '("#222222" nil nil )) + (bg-alt '("#2b2b2b" nil nil )) + (base0 '("#0d0d0d" "black" "black" )) + (base1 '("#1b1b1b" "#1b1b1b" )) + (base2 '("#212122" "#1e1e1e" )) + (base3 '("#292b2b" "#292929" "brightblack")) + (base4 '("#3f4040" "#3f3f3f" "brightblack")) + (base5 '("#5c5e5e" "#525252" "brightblack")) + (base6 '("#757878" "#6b6b6b" "brightblack")) + (base7 '("#969896" "#979797" "brightblack")) + (base8 '("#ffffff" "#ffffff" "white" )) + (fg '("#b2bbc2" "#b2bbc2" "white")) + (fg-alt (doom-darken fg 0.4)) + + (red '("#cc6666" "#cc6666" "red")) + (blue '("#81a2be" "#88aabb" "blue")) + (grey '("#7a8590" "#7a8590" "brightblack")) + (violet '("#a8a0ec" "#a8a0ec" "violet")) + (light-blue '("#90dbe6" "#90dbe6" "lightblue")) + (green '("#b4d982" "#b4d982" "green")) + (yellow '("#fad778" "#fad778" "yellow")) + (orange '("#ef9c73" "#ef9c73" "orange")) + (pink '("#ed6c88" "#ed6c88" "pink")) + + (dark-blue '("#81a2be" "#88aabb" "blue")) + (teal '("#81a2be" "#88aabb" "blue")) + (cyan '("#81a2be" "#88aabb" "blue")) + (dark-cyan '("#81a2be" "#88aabb" "blue")) + (magenta '("#a8a0ec" "#a8a0ec" "violet")) + + ;; face categories + (highlight blue) + (vertical-bar `("#161616" ,@base0)) + (selection `(,(car (doom-lighten bg 0.1)) ,@(cdr base4))) + (builtin light-blue) + (comments grey) + (doc-comments (doom-lighten grey 0.14)) + (constants violet) + (functions green) + (keywords pink) + (methods green) + (operators pink) + (type light-blue) + (strings yellow) + (variables orange) + (numbers yellow) + (region selection) + (error red) + (warning yellow) + (success green) + (vc-modified fg-alt) + (vc-added green) + (vc-deleted red) + + ;; custom categories + (modeline-bg `(,(doom-darken (car bg-alt) 0.3) ,@(cdr base3))) + (modeline-bg-alt `(,(car bg) ,@(cdr base1))) + (modeline-fg fg) + (modeline-fg-alt comments) + (-modeline-pad + (when doom-monokai-pro-padded-modeline + (if (integerp doom-monokai-pror-padded-modeline) + doom-monokai-pro-padded-modeline + 4)))) + + ;; --- faces ------------------------------ + ((doom-modeline-buffer-path :foreground blue :bold bold) + (doom-modeline-buffer-major-mode :inherit 'doom-modeline-buffer-path) + + ((line-number &override) :foreground base4) + ((line-number-current-line &override) :foreground yellow :bold bold) + + ;; rainbow-delimiters + (rainbow-delimiters-depth-1-face :foreground violet) + (rainbow-delimiters-depth-2-face :foreground blue) + (rainbow-delimiters-depth-3-face :foreground orange) + (rainbow-delimiters-depth-4-face :foreground green) + (rainbow-delimiters-depth-5-face :foreground violet) + (rainbow-delimiters-depth-6-face :foreground yellow) + (rainbow-delimiters-depth-7-face :foreground blue) + + (mode-line + :background modeline-bg :foreground modeline-fg + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg))) + (mode-line-inactive + :background modeline-bg-alt :foreground modeline-fg-alt + :box (if -modeline-pad `(:line-width ,-modeline-pad :color ,modeline-bg-alt)))) + + ;; --- variables -------------------------- + ;; () + ) + +(provide 'doom-monokai-pro-theme) +;;; doom-monokai-pro-theme.el ends here From 438973c5f250b5e19b6aa7d98360794e43a45f60 Mon Sep 17 00:00:00 2001 From: Emmanuel Bustos Torres Date: Fri, 13 Mar 2020 08:37:50 -0500 Subject: [PATCH 2/3] Fix: Monokai Pro's palette --- themes/doom-monokai-pro-theme.el | 89 +++++++++++++++++--------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/themes/doom-monokai-pro-theme.el b/themes/doom-monokai-pro-theme.el index b94c0698..1a49fbd1 100644 --- a/themes/doom-monokai-pro-theme.el +++ b/themes/doom-monokai-pro-theme.el @@ -1,4 +1,4 @@ -;; doom-monokai-pro-theme.el --- based off of Monokai Pro -*- no-byte-compile: t; -*- +;; doom-monokai-pro-theme.el --- Port of Monokai Pro -*- no-byte-compile: t; -*- (require 'doom-themes) (defgroup doom-monokai-pro-theme nil @@ -12,55 +12,52 @@ Can be an integer to determine the exact padding." :type '(choice integer boolean)) (def-doom-theme doom-monokai-pro - "A theme based off of Monokai Pro" + "A port of VS Code's Monokai Pro" ;; name gui 256 16 - ((bg '("#222222" nil nil )) - (bg-alt '("#2b2b2b" nil nil )) - (base0 '("#0d0d0d" "black" "black" )) - (base1 '("#1b1b1b" "#1b1b1b" )) - (base2 '("#212122" "#1e1e1e" )) - (base3 '("#292b2b" "#292929" "brightblack")) - (base4 '("#3f4040" "#3f3f3f" "brightblack")) - (base5 '("#5c5e5e" "#525252" "brightblack")) - (base6 '("#757878" "#6b6b6b" "brightblack")) - (base7 '("#969896" "#979797" "brightblack")) - (base8 '("#ffffff" "#ffffff" "white" )) - (fg '("#b2bbc2" "#b2bbc2" "white")) - (fg-alt (doom-darken fg 0.4)) + ((bg '("#2B292E" nil nil )) + (bg-alt '("#221F22" nil nil )) + (base0 '("#0D0D0D" "black" "black" )) + (base1 '("#1B1B1B" "#1B1B1B" )) + (base2 '("#212122" "#212122" )) + (base3 '("#2B2B2B" "#2B2B2B" "brightblack")) + (base4 '("#3F4040" "#3F4040" "brightblack")) + (base5 '("#5C5E5E" "#5C5E5E" "brightblack")) + (base6 '("#757878" "#757878" "brightblack")) + (base7 '("#969896" "#969896" "brightblack")) + (base8 '("#FCFCFA" "#FCFCFA" "white" )) + (fg '("#939293" "#939293" "white")) + (fg-alt '("#A3A2A3" "#A3A2A3" "white")) - (red '("#cc6666" "#cc6666" "red")) - (blue '("#81a2be" "#88aabb" "blue")) - (grey '("#7a8590" "#7a8590" "brightblack")) - (violet '("#a8a0ec" "#a8a0ec" "violet")) - (light-blue '("#90dbe6" "#90dbe6" "lightblue")) - (green '("#b4d982" "#b4d982" "green")) - (yellow '("#fad778" "#fad778" "yellow")) - (orange '("#ef9c73" "#ef9c73" "orange")) - (pink '("#ed6c88" "#ed6c88" "pink")) - - (dark-blue '("#81a2be" "#88aabb" "blue")) - (teal '("#81a2be" "#88aabb" "blue")) - (cyan '("#81a2be" "#88aabb" "blue")) - (dark-cyan '("#81a2be" "#88aabb" "blue")) - (magenta '("#a8a0ec" "#a8a0ec" "violet")) + (grey '("#727072" "#727072" "brightblack")) + (red '("#CC6666" "#CC6666" "red")) + (orange '("#FC9867" "#FC9867" "orange")) + (green '("#A9DC76" "#A9DC76" "green")) + (teal green) + (yellow '("#FFD866" "#FFD866" "yellow")) + (blue '("#78DCE8" "#78DCE8" "blue")) + (dark-blue '("#81A2BE" "#81A2BE" "blue")) + (magenta '("#FF6188" "#FF6188" "violet")) + (violet '("#AB9DF2" "#AB9DF2" "violet")) + (cyan blue) + (dark-cyan dark-blue) ;; face categories - (highlight blue) - (vertical-bar `("#161616" ,@base0)) + (highlight base8) + (vertical-bar (doom-lighten bg 0.1)) (selection `(,(car (doom-lighten bg 0.1)) ,@(cdr base4))) - (builtin light-blue) + (builtin blue) (comments grey) - (doc-comments (doom-lighten grey 0.14)) + (doc-comments yellow) (constants violet) (functions green) - (keywords pink) + (keywords magenta) (methods green) - (operators pink) - (type light-blue) + (operators magenta) + (type blue) (strings yellow) - (variables orange) - (numbers yellow) + (variables base8) + (numbers violet) (region selection) (error red) (warning yellow) @@ -70,7 +67,7 @@ Can be an integer to determine the exact padding." (vc-deleted red) ;; custom categories - (modeline-bg `(,(doom-darken (car bg-alt) 0.3) ,@(cdr base3))) + (modeline-bg bg-alt) (modeline-bg-alt `(,(car bg) ,@(cdr base1))) (modeline-fg fg) (modeline-fg-alt comments) @@ -81,7 +78,17 @@ Can be an integer to determine the exact padding." 4)))) ;; --- faces ------------------------------ - ((doom-modeline-buffer-path :foreground blue :bold bold) + ( + ;; Centaur tabs + (centaur-tabs-selected-modified :inherit 'centaur-tabs-selected :foreground yellow) + (centaur-tabs-unselected-modified :inherit 'centaur-tabs-unselected :foreground yellow) + (centaur-tabs-active-bar-face :background yellow) + (centaur-tabs-modified-marker-selected :inherit 'centaur-tabs-selected :foreground base8) + (centaur-tabs-modified-marker-unselected :inherit 'centaur-tabs-unselected :foreground base8) + + ;; Doom modeline + (doom-modeline-bar :background yellow) + (doom-modeline-buffer-path :foreground blue :bold bold) (doom-modeline-buffer-major-mode :inherit 'doom-modeline-buffer-path) ((line-number &override) :foreground base4) From 39e2d6104a36c11e764c33f966112c664e9e3a96 Mon Sep 17 00:00:00 2001 From: Emmanuel Bustos Torres Date: Fri, 13 Mar 2020 14:36:01 -0500 Subject: [PATCH 3/3] Mod: Revert README to remove conflicts. Fix later --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index f23be0f5..037ffd8b 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,7 @@ DOOM Themes is an opinionated UI plugin and pack of themes extracted from my - [X] `doom-material` adapted from [Material Themes] (thanks to [tam5]) - [X] `doom-manegarm`: an original autumn-inspired dark theme (thanks to [kenranunderscore]) - [X] `doom-molokai`: a theme based on Texmate's Monokai - - [X] `doom-monokai-classic`: port of [Monokai]'s Classic variant (thanks to [ema2159]) - - [X] `doom-monokai-pro`: port of [Monokai]'s Pro variant (thanks to [kadenbarlow]) + - [X] `doom-monokai-classic`: port of [Monokai]'s classic variant (thanks to [ema2159]) - [X] `doom-moonlight` ported from VS Code's [Moonlight Theme] (thanks to [Brettm12345]) - [X] `doom-nord`: dark variant of [Nord][nord] (thanks to [fuxialexander]) - [X] `doom-nord-light`: light variant of [Nord][nord] (thanks to [fuxialexander]) @@ -205,7 +204,6 @@ pointers. Additional theme and plugin support requests are welcome too. [juanwolf]: https://github.com/juanwolf [JongW]: https://github.com/JongW [jwintz]: https://github.com/jwintz -[kadenbarlow]: https://github.com/kadenbarlow [karetsu]: https://github.com/karetsu [kenranunderscore]: https://github.com/kenranunderscore [Material Themes]: https://github.com/equinusocio/vsc-material-theme