commit 78bb9c9192c41bc549f6ff2047f9b3d5b2820a6f parent 5ef66b8dfeba021f8f407c292dc380be6765f990 Author: Thomas Frössman <thomasf@jossystem.se> Date: Sun, 3 Nov 2019 19:40:16 +0100 add gruvbox light and dark themes these might need additional adjustments Diffstat:
| A | solarized-gruvbox-dark-theme.el | | | 35 | +++++++++++++++++++++++++++++++++++ |
| A | solarized-gruvbox-light-theme.el | | | 35 | +++++++++++++++++++++++++++++++++++ |
| M | solarized.el | | | 120 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
3 files changed, 190 insertions(+), 0 deletions(-)
diff --git a/solarized-gruvbox-dark-theme.el b/solarized-gruvbox-dark-theme.el @@ -0,0 +1,35 @@ +;;; solarized-gruvbox-dark-theme.el --- Solarized Theme + +;; Copyright (C) 2019 Thomas Frössman + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: +;; +;; The dark variant of the solarized theme. +;; +;;; Code: + +(require 'solarized) + +(deftheme solarized-gruvbox-dark + "The dark variant of the Solarized colour theme with gruvbox color palette") + +(solarized-definition 'dark 'solarized-gruvbox-dark + solarized-gruvbox-dark-color-palette-alist) + +(provide-theme 'solarized-gruvbox-dark) + +(provide 'solarized-gruvbox-dark-theme) +;;; solarized-gruvbox-dark-theme.el ends here diff --git a/solarized-gruvbox-light-theme.el b/solarized-gruvbox-light-theme.el @@ -0,0 +1,35 @@ +;;; solarized-gruvbox-light-theme.el --- Solarized Theme + +;; Copyright (C) 2019 Thomas Frössman + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see <http://www.gnu.org/licenses/>. + +;;; Commentary: +;; +;; The dark variant of the solarized theme with gruvbox color palette +;; +;;; Code: + +(require 'solarized) + +(deftheme solarized-gruvbox-light + "The light variant of the Solarized colour theme with gruvbox color palette") + +(solarized-definition 'light 'solarized-gruvbox-light + solarized-gruvbox-light-color-palette-alist) + +(provide-theme 'solarized-gruvbox-light) + +(provide 'solarized-gruvbox-light-theme) +;;; solarized-gruvbox-light-theme.el ends here diff --git a/solarized.el b/solarized.el @@ -2501,6 +2501,126 @@ customize the resulting theme." ,(when childtheme `(funcall ',childtheme))))) +;;; gruvbox themes + +(defvar solarized-gruvbox-colors + '((dark0_hard . "#1d2021") + (dark0 . "#282828") + (dark0_soft . "#32302f") + (dark1 . "#3c3836") + (dark2 . "#504945") + (dark3 . "#665c54") + (dark4 . "#7c6f64") + + (gray . "#928374") + + (light0_hard . "#f9f5d7") + (light0 . "#fbf1c7") + (light0_soft . "#f2e5bc") + (light1 . "#ebdbb2") + (light2 . "#d5c4a1") + (light3 . "#bdae93") + (light4 . "#a89984") + + (red . "#cc241d") + (green . "#98971a") + (yellow . "#d79921") + (blue . "#458588") + (purple . "#b16286") + (aqua . "#689d6a") + (orange . "#d65d0e") + + (bright_red . "#fb4933") + (bright_green . "#b8bb26") + (bright_yellow . "#fabd2f") + (bright_blue . "#83a598") + (bright_purple . "#d3869b") + (bright_aqua . "#8ec07c") + (bright_orange . "#fe8019") + + (dark_red . "#9d0006") + (dark_green . "#79740e") + (dark_yellow . "#b57614") + (dark_blue . "#076678") + (dark_purple . "#8f3f71") + (dark_aqua . "#427b58") + (dark_orange . "#af3a03")) + "The gruvbox color palette.") + +(defvar solarized-gruvbox-dark-color-palette-alist + '((s-base00 . (alist-get 'dark4 solarized-gruvbox-colors)) + (s-base01 . (alist-get 'dark3 solarized-gruvbox-colors)) + (s-base02 . (alist-get 'dark0_soft solarized-gruvbox-colors)) + (s-base03 . (alist-get 'dark0 solarized-gruvbox-colors)) + (s-base0 . (alist-get 'light4 solarized-gruvbox-colors)) + (s-base1 . (alist-get 'light3 solarized-gruvbox-colors)) + (s-base2 . (alist-get 'light4 solarized-gruvbox-colors)) + (s-base3 . (alist-get 'light0 solarized-gruvbox-colors)) + + (yellow . (alist-get 'yellow solarized-gruvbox-colors)) + (orange . (alist-get 'orange solarized-gruvbox-colors)) + (red . (alist-get 'bright_red solarized-gruvbox-colors)) + (magenta . (alist-get 'bright_purple solarized-gruvbox-colors)) + (violet . (alist-get 'purple solarized-gruvbox-colors)) + (blue . (alist-get 'bright_blue solarized-gruvbox-colors)) + (cyan . (alist-get 'aqua solarized-gruvbox-colors)) + (green . (alist-get 'green solarized-gruvbox-colors)) + + (yellow-d . (solarized-color-blend (alist-get 'dark_yellow solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (yellow-l . (solarized-color-blend (alist-get 'bright_yellow solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (orange-d . (solarized-color-blend (alist-get 'dark_orange solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (orange-l . (solarized-color-blend (alist-get 'bright_orange solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (red-d . (solarized-color-blend (alist-get 'dark_red solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (red-l . (solarized-color-blend (alist-get 'bright_red solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (magenta-d . (solarized-color-blend (alist-get 'dark_purple solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (magenta-l . (solarized-color-blend (alist-get 'bright_purple solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (violet-d . (solarized-color-blend (alist-get 'dark_purple solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (violet-l . (solarized-color-blend (alist-get 'bright_purple solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (blue-d . (solarized-color-blend (alist-get 'dark_blue solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (blue-l . (solarized-color-blend (alist-get 'bright_blue solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (cyan-d . (solarized-color-blend (alist-get 'dark_aqua solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (cyan-l . (solarized-color-blend (alist-get 'bright_aqua solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (green-d . (solarized-color-blend (alist-get 'dark_green solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (green-l . (solarized-color-blend (alist-get 'bright_green solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2))) + "The solarized gruvbox dark palette color alist.") + +(defvar solarized-gruvbox-light-color-palette-alist + '((s-base00 . (alist-get 'dark4 solarized-gruvbox-colors)) + (s-base01 . (alist-get 'dark3 solarized-gruvbox-colors)) + (s-base02 . (alist-get 'dark0_soft solarized-gruvbox-colors)) + (s-base03 . (alist-get 'dark0 solarized-gruvbox-colors)) + (s-base0 . (alist-get 'dark1 solarized-gruvbox-colors)) + (s-base1 . (alist-get 'light4 solarized-gruvbox-colors)) + (s-base2 . (alist-get 'light1 solarized-gruvbox-colors)) + (s-base3 . (alist-get 'light0 solarized-gruvbox-colors)) + + (yellow . (alist-get 'dark_yellow solarized-gruvbox-colors)) + (orange . (alist-get 'dark_orange solarized-gruvbox-colors)) + (red . (alist-get 'dark_red solarized-gruvbox-colors)) + (magenta . (alist-get 'bright_purple solarized-gruvbox-colors)) + (violet . (alist-get 'dark_purple solarized-gruvbox-colors)) + (blue . (alist-get 'blue solarized-gruvbox-colors)) + (cyan . (alist-get 'aqua solarized-gruvbox-colors)) + (green . (alist-get 'green solarized-gruvbox-colors)) + + (yellow-d . (solarized-color-blend (alist-get 'dark_yellow solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (yellow-l . (solarized-color-blend (alist-get 'bright_yellow solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (orange-d . (solarized-color-blend (alist-get 'dark_orange solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (orange-l . (solarized-color-blend (alist-get 'bright_orange solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (red-d . (solarized-color-blend (alist-get 'dark_red solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (red-l . (solarized-color-blend (alist-get 'bright_red solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (magenta-d . (solarized-color-blend (alist-get 'dark_purple solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (magenta-l . (solarized-color-blend (alist-get 'bright_purple solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (violet-d . (solarized-color-blend (alist-get 'dark_purple solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (violet-l . (solarized-color-blend (alist-get 'bright_purple solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (blue-d . (solarized-color-blend (alist-get 'dark_blue solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (blue-l . (solarized-color-blend (alist-get 'bright_blue solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (cyan-d . (solarized-color-blend (alist-get 'dark_aqua solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (cyan-l . (solarized-color-blend (alist-get 'bright_aqua solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2)) + (green-d . (solarized-color-blend (alist-get 'dark_green solarized-gruvbox-colors) (alist-get 'dark0 solarized-gruvbox-colors) 0.80 2)) + (green-l . (solarized-color-blend (alist-get 'bright_green solarized-gruvbox-colors) (alist-get 'light0 solarized-gruvbox-colors) 0.80 2))) + "The solarized gruvbox light color palette alist.") + ;;; Footer ;;;###autoload