diff --git a/child-theme-example/themes/my-solarized-dark-theme.el b/child-theme-example/themes/my-solarized-dark-theme.el
index 7ffcb997..d6ea2342 100644
--- a/child-theme-example/themes/my-solarized-dark-theme.el
+++ b/child-theme-example/themes/my-solarized-dark-theme.el
@@ -1,7 +1,6 @@
(require 'solarized)
+(require 'solarized-dark-theme)
(require 'my-solarized)
-(eval-when-compile
- (require 'solarized-palettes))
;; This files needs to be places iside the custom-theme-load-path list
diff --git a/child-theme-example/themes/my-solarized-light-theme.el b/child-theme-example/themes/my-solarized-light-theme.el
index beea37d0..c33323ca 100644
--- a/child-theme-example/themes/my-solarized-light-theme.el
+++ b/child-theme-example/themes/my-solarized-light-theme.el
@@ -1,7 +1,6 @@
(require 'solarized)
+(require 'solarized-light-theme)
(require 'my-solarized)
-(eval-when-compile
- (require 'solarized-palettes))
;; This files needs to be places iside the custom-theme-load-path list
diff --git a/dev-emacs.d/init.el b/dev-emacs.d/init.el
index 3d7056e6..b7fe651d 100644
--- a/dev-emacs.d/init.el
+++ b/dev-emacs.d/init.el
@@ -52,6 +52,21 @@
;; (toggle-debug-on-error)
+(when load-file-name
+ (let* ((init-dir (file-name-as-directory (file-name-directory load-file-name)))
+ (elisp-dir (expand-file-name ".." init-dir))
+ (childtheme-dir (expand-file-name "../solarized-child-themes" init-dir))
+ (childtheme-sample-dir (expand-file-name "../child-theme-example" init-dir))
+ (childtheme-sample-themes-dir (expand-file-name "themes" childtheme-sample-dir)))
+
+ (defvar dev-project-root elisp-dir)
+
+ (add-to-list 'load-path elisp-dir)
+ (add-to-list 'load-path childtheme-sample-dir)
+ (setq custom-theme-load-path (list elisp-dir childtheme-dir childtheme-sample-themes-dir)
+ package-user-dir (expand-file-name "elpa" init-dir)
+ package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
+ ("melpa" . "https://melpa.org/packages/")))))
(defun dev-open-merge()
(interactive)
diff --git a/solarized-child-themes/solarized-gruvbox-dark-theme.el b/solarized-child-themes/solarized-gruvbox-dark-theme.el
new file mode 100644
index 00000000..ef6d2034
--- /dev/null
+++ b/solarized-child-themes/solarized-gruvbox-dark-theme.el
@@ -0,0 +1,152 @@
+;;; solarized-gruvbox-dark-theme.el --- Solarized Theme -*- lexical-binding: t -*-
+
+;; 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 .
+
+;;; 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")
+
+(defvar solarized-gruvbox-colors
+ '(;; 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")
+ ;; colors end
+ )
+ "The gruvbox color palette.")
+
+(defvar solarized-gruvbox-dark-color-palette-alist
+ '(;; gruvbox-dark palette
+ (base03 . "#282828")
+ (base02 . "#32302f")
+ (base01 . "#7c6f64")
+ (base00 . "#282828")
+ (base0 . "#a89984")
+ (base1 . "#bdae93")
+ (base2 . "#a89984")
+ (base3 . "#fbf1c7")
+ (yellow . "#d79921")
+ (orange . "#d65d0e")
+ (red . "#fb4933")
+ (magenta . "#d3869b")
+ (violet . "#b16286")
+ (blue . "#458588")
+ (cyan . "#689d6a")
+ (green . "#98971a")
+ (yellow-1bg . "#3f3528")
+ (yellow-1fg . "#e2b055")
+ (yellow-2bg . "#614923")
+ (yellow-2fg . "#dfb566")
+ (yellow-d . "#a76e00")
+ (yellow-l . "#f3ac41")
+ (orange-1bg . "#402e25")
+ (orange-1fg . "#e48847")
+ (orange-2bg . "#62351c")
+ (orange-2fg . "#e2965a")
+ (orange-d . "#a53600")
+ (orange-l . "#f37535")
+ (red-1bg . "#452e28")
+ (red-1fg . "#ff815b")
+ (red-2bg . "#6f3125")
+ (red-2fg . "#f89169")
+ (red-d . "#b21b0a")
+ (red-l . "#ff6540")
+ (magenta-1bg . "#3d3335")
+ (magenta-1fg . "#dda3a6")
+ (magenta-2bg . "#5e434a")
+ (magenta-2fg . "#dbaba4")
+ (magenta-d . "#9f4d64")
+ (magenta-l . "#e78c9e")
+ (violet-1bg . "#392f33")
+ (violet-1fg . "#c68a97")
+ (violet-2bg . "#523642")
+ (violet-2fg . "#c89798")
+ (violet-d . "#8b2a58")
+ (violet-l . "#d36b91")
+ (blue-1bg . "#2c3333")
+ (blue-1fg . "#7da298")
+ (blue-2bg . "#2d4243")
+ (blue-2fg . "#90aa99")
+ (blue-d . "#14676b")
+ (blue-l . "#63a6a5")
+ (cyan-1bg . "#2f362f")
+ (cyan-1fg . "#91b382")
+ (cyan-2bg . "#384a38")
+ (cyan-2fg . "#9fb888")
+ (cyan-d . "#2e7d33")
+ (cyan-l . "#75bf6b")
+ (green-1bg . "#363527")
+ (green-1fg . "#b4ae51")
+ (green-2bg . "#4a4821")
+ (green-2fg . "#bab462")
+ (green-d . "#747400")
+ (green-l . "#b9b340")
+ ;; palette end
+ )
+ "The solarized gruvbox dark palette color alist.")
+
+(solarized-with-color-variables 'dark 'solarized-gruvbox-dark
+ solarized-gruvbox-dark-color-palette-alist)
+
+(provide-theme 'solarized-gruvbox-dark)
+
+(provide 'solarized-gruvbox-dark-theme)
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+
+;;; solarized-gruvbox-dark-theme.el ends here
diff --git a/solarized-child-themes/solarized-gruvbox-light-theme.el b/solarized-child-themes/solarized-gruvbox-light-theme.el
new file mode 100644
index 00000000..05e34707
--- /dev/null
+++ b/solarized-child-themes/solarized-gruvbox-light-theme.el
@@ -0,0 +1,110 @@
+;;; solarized-gruvbox-light-theme.el --- Solarized Theme -*- lexical-binding: t -*-
+
+;; 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 .
+
+;;; 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")
+
+(defvar solarized-gruvbox-light-color-palette-alist
+ '(;; gruvbox-light palette
+ (base03 . "#282828")
+ (base02 . "#32302f")
+ (base01 . "#665c54")
+ (base00 . "#7c6f64")
+ (base0 . "#3c3836")
+ (base1 . "#a89984")
+ (base2 . "#ebdbb2")
+ (base3 . "#fbf1c7")
+ (yellow . "#b57614")
+ (orange . "#af3a03")
+ (red . "#9d0006")
+ (magenta . "#d3869b")
+ (violet . "#8f3f71")
+ (blue . "#076678")
+ (cyan . "#689d6a")
+ (green . "#98971a")
+ (yellow-1bg . "#f6e1af")
+ (yellow-1fg . "#8c6023")
+ (yellow-2bg . "#efc98b")
+ (yellow-2fg . "#7f5b2d")
+ (yellow-d . "#8a5100")
+ (yellow-l . "#e29a3f")
+ (orange-1bg . "#f7d8ab")
+ (orange-1fg . "#893a18")
+ (orange-2bg . "#f0b382")
+ (orange-2fg . "#7e3e23")
+ (orange-d . "#841900")
+ (orange-l . "#df6835")
+ (red-1bg . "#f5d4aa")
+ (red-1fg . "#7e2115")
+ (red-2bg . "#eaa67f")
+ (red-2fg . "#752d21")
+ (red-d . "#750000")
+ (red-l . "#cf5130")
+ (magenta-1bg . "#f9e4c3")
+ (magenta-1fg . "#9e6b78")
+ (magenta-2bg . "#f8d1c0")
+ (magenta-2fg . "#8c646e")
+ (magenta-d . "#9f4d64")
+ (magenta-l . "#f598a7")
+ (violet-1bg . "#eed8bd")
+ (violet-1fg . "#713c5c")
+ (violet-2bg . "#dcb3af")
+ (violet-2fg . "#694058")
+ (violet-d . "#6f104d")
+ (violet-l . "#c2608f")
+ (blue-1bg . "#dedebe")
+ (blue-1fg . "#245561")
+ (blue-2bg . "#b1c2b2")
+ (blue-2fg . "#30535c")
+ (blue-d . "#004858")
+ (blue-l . "#5b919b")
+ (cyan-1bg . "#e7e7bb")
+ (cyan-1fg . "#577a58")
+ (cyan-2bg . "#cbdaab")
+ (cyan-2fg . "#556f55")
+ (cyan-d . "#2e7d33")
+ (cyan-l . "#82cc73")
+ (green-1bg . "#f0e6b1")
+ (green-1fg . "#787628")
+ (green-2bg . "#e0d78f")
+ (green-2fg . "#6f6c32")
+ (green-d . "#747400")
+ (green-l . "#c6c148")
+ ;; palette end
+ )
+ "The solarized gruvbox light color palette alist.")
+
+(solarized-with-color-variables 'light 'solarized-gruvbox-light
+ solarized-gruvbox-light-color-palette-alist)
+
+(provide-theme 'solarized-gruvbox-light)
+
+(provide 'solarized-gruvbox-light-theme)
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+
+;;; solarized-gruvbox-light-theme.el ends here
diff --git a/solarized-wombat-dark-theme.el b/solarized-child-themes/solarized-wombat-dark-theme.el
similarity index 97%
rename from solarized-wombat-dark-theme.el
rename to solarized-child-themes/solarized-wombat-dark-theme.el
index e9e45bda..a6d74942 100644
--- a/solarized-wombat-dark-theme.el
+++ b/solarized-child-themes/solarized-wombat-dark-theme.el
@@ -22,8 +22,6 @@
;;; Code:
(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
(deftheme solarized-wombat-dark "The the dark solarized theme with the wombat palette")
diff --git a/solarized-child-themes/solarized-zenburn-theme.el b/solarized-child-themes/solarized-zenburn-theme.el
new file mode 100644
index 00000000..d338dec0
--- /dev/null
+++ b/solarized-child-themes/solarized-zenburn-theme.el
@@ -0,0 +1,110 @@
+;;; solarized-zenburn-theme.el --- Solarized Theme -*- lexical-binding: t -*-
+
+;; 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 .
+
+;;; Commentary:
+;;
+;; The dark variant of the solarized theme with a zenburn palette.
+;;
+;;; Code:
+
+(require 'solarized)
+
+(deftheme solarized-zenburn
+ "The dark variant of the Solarized colour theme with gruvbox color palette")
+
+(defvar solarized-zenburn-color-palette-alist
+ '(;; zenburn palette
+ (base03 . "#3F3F3F")
+ (base02 . "#4F4F4F")
+ (base01 . "#878777")
+ (base00 . "#6F6F6F")
+ (base0 . "#DCDCCC")
+ (base1 . "#FFFFEF")
+ (base2 . "#fffff6")
+ (base3 . "#FFFFFD")
+ (yellow . "#F0DFAF")
+ (orange . "#DFAF8F")
+ (red . "#CC9393")
+ (magenta . "#DC8CC3")
+ (violet . "#bbb0cb")
+ (blue . "#8CD0D3")
+ (cyan . "#93E0E3")
+ (green . "#7F9F7F")
+ (yellow-1bg . "#55524c")
+ (yellow-1fg . "#f2e6c3")
+ (yellow-2bg . "#777160")
+ (yellow-2fg . "#ece2c7")
+ (yellow-d . "#b6a576")
+ (yellow-l . "#fff7c4")
+ (orange-1bg . "#534c48")
+ (orange-1fg . "#e7c4ac")
+ (orange-2bg . "#726054")
+ (orange-2fg . "#e4c7b4")
+ (orange-d . "#ac7b5a")
+ (orange-l . "#ffcaa5")
+ (red-1bg . "#504948")
+ (red-1fg . "#dab0af")
+ (red-2bg . "#6b5656")
+ (red-2fg . "#d9b8b6")
+ (red-d . "#9f5c5c")
+ (red-l . "#f4a9a6")
+ (magenta-1bg . "#52484f")
+ (magenta-1fg . "#e5acd1")
+ (magenta-2bg . "#705467")
+ (magenta-2fg . "#e2b5d2")
+ (magenta-d . "#aa5790")
+ (magenta-l . "#ffa6e0")
+ (violet-1bg . "#4e4c50")
+ (violet-1fg . "#ccc4d7")
+ (violet-2bg . "#64606a")
+ (violet-2fg . "#cec8d6")
+ (violet-d . "#85749c")
+ (violet-l . "#d5c3ec")
+ (blue-1bg . "#495051")
+ (blue-1fg . "#addbdd")
+ (blue-2bg . "#556c6c")
+ (blue-2fg . "#b7dada")
+ (blue-d . "#57a2a4")
+ (blue-l . "#a9f4f5")
+ (cyan-1bg . "#4a5253")
+ (cyan-1fg . "#b3e7e8")
+ (cyan-2bg . "#577172")
+ (cyan-2fg . "#bbe3e3")
+ (cyan-d . "#5dacaf")
+ (cyan-l . "#b0ffff")
+ (green-1bg . "#464a46")
+ (green-1fg . "#a2b8a1")
+ (green-2bg . "#4f5a4e")
+ (green-2fg . "#acbeab")
+ (green-d . "#488249")
+ (green-l . "#95d291")
+ ;; palette end
+ )
+ "The solarized color palette alist.")
+
+(solarized-with-color-variables 'dark 'solarized-zenburn
+ solarized-zenburn-color-palette-alist)
+
+(provide-theme 'solarized-zenburn)
+
+(provide 'solarized-zenburn-theme)
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End:
+
+;;; solarized-zenburn-theme.el ends here
diff --git a/solarized-dark-high-contrast-theme.el b/solarized-dark-high-contrast-theme.el
index 60b2da5b..65929ed3 100644
--- a/solarized-dark-high-contrast-theme.el
+++ b/solarized-dark-high-contrast-theme.el
@@ -22,12 +22,80 @@
;;; Code:
(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
(deftheme solarized-dark-high-contrast
"The dark variant of the Solarized colour theme with slightly higher text contrast")
+(defvar solarized-dark-high-contrast-palette-alist
+ '(;; solarized-dark-high-contrast palette
+ (base03 . "#002732")
+ (base02 . "#01323d")
+ (base01 . "#62787f")
+ (base00 . "#60767e")
+ (base0 . "#8d9fa1")
+ (base1 . "#9eacac")
+ (base2 . "#faf3e0")
+ (base3 . "#ffffee")
+ (yellow . "#c49619")
+ (orange . "#db5823")
+ (red . "#ec423a")
+ (magenta . "#e2468f")
+ (violet . "#7a7ed2")
+ (blue . "#3c98e0")
+ (cyan . "#3cafa5")
+ (green . "#93a61a")
+ (yellow-1bg . "#273430")
+ (yellow-1fg . "#bb9a4c")
+ (yellow-2bg . "#484224")
+ (yellow-2fg . "#bba165")
+ (yellow-d . "#936d00")
+ (yellow-l . "#f3be51")
+ (orange-1bg . "#2d2d2f")
+ (orange-1fg . "#d0744d")
+ (orange-2bg . "#522f22")
+ (orange-2fg . "#cd8464")
+ (orange-d . "#a72e01")
+ (orange-l . "#ff8148")
+ (red-1bg . "#2f2c31")
+ (red-1fg . "#dc6a5a")
+ (red-2bg . "#582b29")
+ (red-2fg . "#d77e6f")
+ (red-d . "#ae1212")
+ (red-l . "#ff7254")
+ (magenta-1bg . "#292d3c")
+ (magenta-1fg . "#d16c96")
+ (magenta-2bg . "#512c46")
+ (magenta-2fg . "#cd809f")
+ (magenta-d . "#a81761")
+ (magenta-l . "#ff75ab")
+ (violet-1bg . "#103145")
+ (violet-1fg . "#8589c4")
+ (violet-2bg . "#213a5e")
+ (violet-2fg . "#9095c4")
+ (violet-d . "#3548a2")
+ (violet-l . "#9b94f2")
+ (blue-1bg . "#023447")
+ (blue-1fg . "#649bce")
+ (blue-2bg . "#004363")
+ (blue-2fg . "#78a3cb")
+ (blue-d . "#0069b0")
+ (blue-l . "#7ebaff")
+ (cyan-1bg . "#03373f")
+ (cyan-1fg . "#60aca4")
+ (cyan-2bg . "#004b4f")
+ (cyan-2fg . "#73b0aa")
+ (cyan-d . "#008981")
+ (cyan-l . "#77dece")
+ (green-1bg . "#1e3531")
+ (green-1fg . "#97a54d")
+ (green-2bg . "#354725")
+ (green-2fg . "#9eaa66")
+ (green-d . "#687f00")
+ (green-l . "#c3d255")
+ ;; palette end
+ )
+ "The solarized color palette alist.")
+
(solarized-with-color-variables 'dark 'solarized-dark-high-contrast
solarized-dark-high-contrast-palette-alist)
diff --git a/solarized-dark-theme.el b/solarized-dark-theme.el
index 8198c195..2b6e71a5 100644
--- a/solarized-dark-theme.el
+++ b/solarized-dark-theme.el
@@ -22,11 +22,79 @@
;;; Code:
(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
(deftheme solarized-dark "The dark variant of the Solarized colour theme")
+(defvar solarized-dark-color-palette-alist
+ '(;; solarized-dark palette
+ (base03 . "#002b36")
+ (base02 . "#073642")
+ (base01 . "#586e75")
+ (base00 . "#657b83")
+ (base0 . "#839496")
+ (base1 . "#93a1a1")
+ (base2 . "#eee8d5")
+ (base3 . "#fdf6e3")
+ (yellow . "#b58900")
+ (orange . "#cb4b16")
+ (red . "#dc322f")
+ (magenta . "#d33682")
+ (violet . "#6c71c4")
+ (blue . "#268bd2")
+ (cyan . "#2aa198")
+ (green . "#859900")
+ (yellow-1bg . "#273532")
+ (yellow-1fg . "#af8f41")
+ (yellow-2bg . "#433e20")
+ (yellow-2fg . "#b39a5e")
+ (yellow-d . "#866300")
+ (yellow-l . "#e1af4b")
+ (orange-1bg . "#2b2d2e")
+ (orange-1fg . "#ca6f48")
+ (orange-2bg . "#4d2c1f")
+ (orange-2fg . "#c47c5d")
+ (orange-d . "#992700")
+ (orange-l . "#fb7640")
+ (red-1bg . "#2d2c31")
+ (red-1fg . "#d66556")
+ (red-2bg . "#532725")
+ (red-2fg . "#ce7667")
+ (red-d . "#a7020a")
+ (red-l . "#ff6849")
+ (magenta-1bg . "#272d3c")
+ (magenta-1fg . "#cc6791")
+ (magenta-2bg . "#4c2942")
+ (magenta-2fg . "#c47896")
+ (magenta-d . "#a00559")
+ (magenta-l . "#ff699e")
+ (violet-1bg . "#0c3144")
+ (violet-1fg . "#8085c0")
+ (violet-2bg . "#1a365a")
+ (violet-2fg . "#888dbc")
+ (violet-d . "#243e9b")
+ (violet-l . "#8d85e7")
+ (blue-1bg . "#003547")
+ (blue-1fg . "#5c93c5")
+ (blue-2bg . "#003f5e")
+ (blue-2fg . "#709bc3")
+ (blue-d . "#0061a8")
+ (blue-l . "#74adf5")
+ (cyan-1bg . "#013841")
+ (cyan-1fg . "#54a099")
+ (cyan-2bg . "#00464a")
+ (cyan-2fg . "#6ba8a2")
+ (cyan-d . "#007d76")
+ (cyan-l . "#6ccec0")
+ (green-1bg . "#1d3732")
+ (green-1fg . "#8c9a43")
+ (green-2bg . "#2f4321")
+ (green-2fg . "#97a35f")
+ (green-d . "#5b7300")
+ (green-l . "#b3c34d")
+ ;; palette end
+ )
+ "The solarized color palette alist.")
+
(solarized-with-color-variables 'dark 'solarized-dark
solarized-dark-color-palette-alist)
diff --git a/solarized-gruvbox-dark-theme.el b/solarized-gruvbox-dark-theme.el
deleted file mode 100644
index 1cb6f943..00000000
--- a/solarized-gruvbox-dark-theme.el
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; solarized-gruvbox-dark-theme.el --- Solarized Theme -*- lexical-binding: t -*-
-
-;; 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 .
-
-;;; Commentary:
-;;
-;; The dark variant of the solarized theme.
-;;
-;;; Code:
-
-(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
-
-(deftheme solarized-gruvbox-dark
- "The dark variant of the Solarized colour theme with gruvbox color palette")
-
-(solarized-with-color-variables 'dark 'solarized-gruvbox-dark
- solarized-gruvbox-dark-color-palette-alist)
-
-(provide-theme 'solarized-gruvbox-dark)
-
-(provide 'solarized-gruvbox-dark-theme)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
-;;; solarized-gruvbox-dark-theme.el ends here
diff --git a/solarized-gruvbox-light-theme.el b/solarized-gruvbox-light-theme.el
deleted file mode 100644
index a825781d..00000000
--- a/solarized-gruvbox-light-theme.el
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; solarized-gruvbox-light-theme.el --- Solarized Theme -*- lexical-binding: t -*-
-
-;; 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 .
-
-;;; Commentary:
-;;
-;; The dark variant of the solarized theme with gruvbox color palette
-;;
-;;; Code:
-
-(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
-
-(deftheme solarized-gruvbox-light
- "The light variant of the Solarized colour theme with gruvbox color palette")
-
-(solarized-with-color-variables 'light 'solarized-gruvbox-light
- solarized-gruvbox-light-color-palette-alist)
-
-(provide-theme 'solarized-gruvbox-light)
-
-(provide 'solarized-gruvbox-light-theme)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
-;;; solarized-gruvbox-light-theme.el ends here
diff --git a/solarized-light-high-contrast-theme.el b/solarized-light-high-contrast-theme.el
index b4e0b96b..ecbf5a3c 100644
--- a/solarized-light-high-contrast-theme.el
+++ b/solarized-light-high-contrast-theme.el
@@ -22,12 +22,80 @@
;;; Code:
(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
(deftheme solarized-light-high-contrast
"The light variant of the Solarized colour theme with slightly higher text contrast")
+(defvar solarized-light-high-contrast-palette-alist
+ '(;; solarized-light-high-contrast palette
+ (base03 . "#00212b")
+ (base02 . "#002b37")
+ (base01 . "#5d737a")
+ (base00 . "#596e76")
+ (base0 . "#88999b")
+ (base1 . "#98a6a6")
+ (base2 . "#f4eedb")
+ (base3 . "#fffce9")
+ (yellow . "#a67c00")
+ (orange . "#bb3e06")
+ (red . "#cc1f24")
+ (magenta . "#c42475")
+ (violet . "#5e65b6")
+ (blue . "#007ec4")
+ (cyan . "#11948b")
+ (green . "#778c00")
+ (yellow-1bg . "#f7ebcb")
+ (yellow-1fg . "#7a6120")
+ (yellow-2bg . "#ecd29c")
+ (yellow-2fg . "#6b5a2c")
+ (yellow-d . "#785700")
+ (yellow-l . "#d6a549")
+ (orange-1bg . "#fee2c8")
+ (orange-1fg . "#8a3b1c")
+ (orange-2bg . "#fabc97")
+ (orange-2fg . "#793e28")
+ (orange-d . "#891b00")
+ (orange-l . "#ed6e3e")
+ (red-1bg . "#ffe1cb")
+ (red-1fg . "#952f2a")
+ (red-2bg . "#ffb79f")
+ (red-2fg . "#823731")
+ (red-d . "#990001")
+ (red-l . "#ff6243")
+ (magenta-1bg . "#fce1da")
+ (magenta-1fg . "#8e3160")
+ (magenta-2bg . "#f9b9c4")
+ (magenta-2fg . "#7a395c")
+ (magenta-d . "#93004d")
+ (magenta-l . "#f46495")
+ (violet-1bg . "#ebe7e5")
+ (violet-1fg . "#44528c")
+ (violet-2bg . "#cdc8e1")
+ (violet-2fg . "#3d4f7e")
+ (violet-d . "#11328f")
+ (violet-l . "#837bdf")
+ (blue-1bg . "#e6ebe7")
+ (blue-1fg . "#0a6395")
+ (blue-2bg . "#bfd2e6")
+ (blue-2fg . "#185b85")
+ (blue-d . "#005797")
+ (blue-l . "#6fa5e7")
+ (cyan-1bg . "#e4efdd")
+ (cyan-1fg . "#10716f")
+ (cyan-2bg . "#b9ddcd")
+ (cyan-2fg . "#196767")
+ (cyan-d . "#006d68")
+ (cyan-l . "#66c1b3")
+ (green-1bg . "#eeedcb")
+ (green-1fg . "#596c21")
+ (green-2bg . "#d5d99d")
+ (green-2fg . "#51622d")
+ (green-d . "#4f6600")
+ (green-l . "#a8b84b")
+ ;; palette end
+ )
+ "The solarized color palette alist.")
+
(solarized-with-color-variables 'light 'solarized-light-high-contrast
solarized-light-high-contrast-palette-alist)
diff --git a/solarized-light-theme.el b/solarized-light-theme.el
index 7a0b8cb8..209536c7 100644
--- a/solarized-light-theme.el
+++ b/solarized-light-theme.el
@@ -22,11 +22,79 @@
;;; Code:
(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
(deftheme solarized-light "The light variant of the Solarized colour theme")
+(defvar solarized-light-color-palette-alist
+ '(;; solarized-light palette
+ (base03 . "#002b36")
+ (base02 . "#073642")
+ (base01 . "#586e75")
+ (base00 . "#657b83")
+ (base0 . "#839496")
+ (base1 . "#93a1a1")
+ (base2 . "#eee8d5")
+ (base3 . "#fdf6e3")
+ (yellow . "#b58900")
+ (orange . "#cb4b16")
+ (red . "#dc322f")
+ (magenta . "#d33682")
+ (violet . "#6c71c4")
+ (blue . "#268bd2")
+ (cyan . "#2aa198")
+ (green . "#859900")
+ (yellow-1bg . "#f8e8c6")
+ (yellow-1fg . "#876d26")
+ (yellow-2bg . "#f1d49b")
+ (yellow-2fg . "#766634")
+ (yellow-d . "#866300")
+ (yellow-l . "#e1af4b")
+ (orange-1bg . "#fedfc5")
+ (orange-1fg . "#974727")
+ (orange-2bg . "#ffbd99")
+ (orange-2fg . "#854a33")
+ (orange-d . "#992700")
+ (orange-l . "#fb7640")
+ (red-1bg . "#ffdec8")
+ (red-1fg . "#a33c35")
+ (red-2bg . "#ffb9a1")
+ (red-2fg . "#8e433d")
+ (red-d . "#a7020a")
+ (red-l . "#ff6849")
+ (magenta-1bg . "#fdded7")
+ (magenta-1fg . "#9a3f6c")
+ (magenta-2bg . "#fdbac6")
+ (magenta-2fg . "#854568")
+ (magenta-d . "#a00559")
+ (magenta-l . "#ff699e")
+ (violet-1bg . "#ebe4e2")
+ (violet-1fg . "#4f5e99")
+ (violet-2bg . "#d1c9e3")
+ (violet-2fg . "#475a8b")
+ (violet-d . "#243e9b")
+ (violet-l . "#8d85e7")
+ (blue-1bg . "#e7e8e4")
+ (blue-1fg . "#1e6fa2")
+ (blue-2bg . "#c3d5e9")
+ (blue-2fg . "#246792")
+ (blue-d . "#0061a8")
+ (blue-l . "#74adf5")
+ (cyan-1bg . "#e4ecda")
+ (cyan-1fg . "#207e7b")
+ (cyan-2bg . "#bedfcf")
+ (cyan-2fg . "#247374")
+ (cyan-d . "#007d76")
+ (cyan-l . "#6ccec0")
+ (green-1bg . "#efeac7")
+ (green-1fg . "#657827")
+ (green-2bg . "#dbdb9c")
+ (green-2fg . "#5b6e35")
+ (green-d . "#5b7300")
+ (green-l . "#b3c34d")
+ ;; palette end
+ )
+ "The solarized color palette alist.")
+
(solarized-with-color-variables 'light 'solarized-light
solarized-light-color-palette-alist)
diff --git a/solarized-palettes.el b/solarized-palettes.el
deleted file mode 100644
index 66466e42..00000000
--- a/solarized-palettes.el
+++ /dev/null
@@ -1,569 +0,0 @@
-;;; solarized-palettes.el --- solarized palettes -*- lexical-binding: t -*-
-
-;; Copyright (C) 2011-2019 Bozhidar Batsov
-
-;; Author: Bozhidar Batsov
-;; Author: 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 .
-
-;;; Commentary:
-
-;; This file only contains data which is lists of colors of some sort,
-;; there is also code that generates palettes in solarized.el. That
-;; code does not belong here.
-
-;;; Code:
-
-(defvar solarized-dark-color-palette-alist
- '(;; solarized-dark palette
- (base03 . "#002b36")
- (base02 . "#073642")
- (base01 . "#586e75")
- (base00 . "#657b83")
- (base0 . "#839496")
- (base1 . "#93a1a1")
- (base2 . "#eee8d5")
- (base3 . "#fdf6e3")
- (yellow . "#b58900")
- (orange . "#cb4b16")
- (red . "#dc322f")
- (magenta . "#d33682")
- (violet . "#6c71c4")
- (blue . "#268bd2")
- (cyan . "#2aa198")
- (green . "#859900")
- (yellow-1bg . "#273532")
- (yellow-1fg . "#af8f41")
- (yellow-2bg . "#433e20")
- (yellow-2fg . "#b39a5e")
- (yellow-d . "#866300")
- (yellow-l . "#e1af4b")
- (orange-1bg . "#2b2d2e")
- (orange-1fg . "#ca6f48")
- (orange-2bg . "#4d2c1f")
- (orange-2fg . "#c47c5d")
- (orange-d . "#992700")
- (orange-l . "#fb7640")
- (red-1bg . "#2d2c31")
- (red-1fg . "#d66556")
- (red-2bg . "#532725")
- (red-2fg . "#ce7667")
- (red-d . "#a7020a")
- (red-l . "#ff6849")
- (magenta-1bg . "#272d3c")
- (magenta-1fg . "#cc6791")
- (magenta-2bg . "#4c2942")
- (magenta-2fg . "#c47896")
- (magenta-d . "#a00559")
- (magenta-l . "#ff699e")
- (violet-1bg . "#0c3144")
- (violet-1fg . "#8085c0")
- (violet-2bg . "#1a365a")
- (violet-2fg . "#888dbc")
- (violet-d . "#243e9b")
- (violet-l . "#8d85e7")
- (blue-1bg . "#003547")
- (blue-1fg . "#5c93c5")
- (blue-2bg . "#003f5e")
- (blue-2fg . "#709bc3")
- (blue-d . "#0061a8")
- (blue-l . "#74adf5")
- (cyan-1bg . "#013841")
- (cyan-1fg . "#54a099")
- (cyan-2bg . "#00464a")
- (cyan-2fg . "#6ba8a2")
- (cyan-d . "#007d76")
- (cyan-l . "#6ccec0")
- (green-1bg . "#1d3732")
- (green-1fg . "#8c9a43")
- (green-2bg . "#2f4321")
- (green-2fg . "#97a35f")
- (green-d . "#5b7300")
- (green-l . "#b3c34d")
- ;; palette end
- )
- "The solarized color palette alist.")
-
-(defvar solarized-light-color-palette-alist
- '(;; solarized-light palette
- (base03 . "#002b36")
- (base02 . "#073642")
- (base01 . "#586e75")
- (base00 . "#657b83")
- (base0 . "#839496")
- (base1 . "#93a1a1")
- (base2 . "#eee8d5")
- (base3 . "#fdf6e3")
- (yellow . "#b58900")
- (orange . "#cb4b16")
- (red . "#dc322f")
- (magenta . "#d33682")
- (violet . "#6c71c4")
- (blue . "#268bd2")
- (cyan . "#2aa198")
- (green . "#859900")
- (yellow-1bg . "#f8e8c6")
- (yellow-1fg . "#876d26")
- (yellow-2bg . "#f1d49b")
- (yellow-2fg . "#766634")
- (yellow-d . "#866300")
- (yellow-l . "#e1af4b")
- (orange-1bg . "#fedfc5")
- (orange-1fg . "#974727")
- (orange-2bg . "#ffbd99")
- (orange-2fg . "#854a33")
- (orange-d . "#992700")
- (orange-l . "#fb7640")
- (red-1bg . "#ffdec8")
- (red-1fg . "#a33c35")
- (red-2bg . "#ffb9a1")
- (red-2fg . "#8e433d")
- (red-d . "#a7020a")
- (red-l . "#ff6849")
- (magenta-1bg . "#fdded7")
- (magenta-1fg . "#9a3f6c")
- (magenta-2bg . "#fdbac6")
- (magenta-2fg . "#854568")
- (magenta-d . "#a00559")
- (magenta-l . "#ff699e")
- (violet-1bg . "#ebe4e2")
- (violet-1fg . "#4f5e99")
- (violet-2bg . "#d1c9e3")
- (violet-2fg . "#475a8b")
- (violet-d . "#243e9b")
- (violet-l . "#8d85e7")
- (blue-1bg . "#e7e8e4")
- (blue-1fg . "#1e6fa2")
- (blue-2bg . "#c3d5e9")
- (blue-2fg . "#246792")
- (blue-d . "#0061a8")
- (blue-l . "#74adf5")
- (cyan-1bg . "#e4ecda")
- (cyan-1fg . "#207e7b")
- (cyan-2bg . "#bedfcf")
- (cyan-2fg . "#247374")
- (cyan-d . "#007d76")
- (cyan-l . "#6ccec0")
- (green-1bg . "#efeac7")
- (green-1fg . "#657827")
- (green-2bg . "#dbdb9c")
- (green-2fg . "#5b6e35")
- (green-d . "#5b7300")
- (green-l . "#b3c34d")
- ;; palette end
- )
- "The solarized color palette alist.")
-
-(defvar solarized-dark-high-contrast-palette-alist
- '(;; solarized-dark-high-contrast palette
- (base03 . "#002732")
- (base02 . "#01323d")
- (base01 . "#62787f")
- (base00 . "#60767e")
- (base0 . "#8d9fa1")
- (base1 . "#9eacac")
- (base2 . "#faf3e0")
- (base3 . "#ffffee")
- (yellow . "#c49619")
- (orange . "#db5823")
- (red . "#ec423a")
- (magenta . "#e2468f")
- (violet . "#7a7ed2")
- (blue . "#3c98e0")
- (cyan . "#3cafa5")
- (green . "#93a61a")
- (yellow-1bg . "#273430")
- (yellow-1fg . "#bb9a4c")
- (yellow-2bg . "#484224")
- (yellow-2fg . "#bba165")
- (yellow-d . "#936d00")
- (yellow-l . "#f3be51")
- (orange-1bg . "#2d2d2f")
- (orange-1fg . "#d0744d")
- (orange-2bg . "#522f22")
- (orange-2fg . "#cd8464")
- (orange-d . "#a72e01")
- (orange-l . "#ff8148")
- (red-1bg . "#2f2c31")
- (red-1fg . "#dc6a5a")
- (red-2bg . "#582b29")
- (red-2fg . "#d77e6f")
- (red-d . "#ae1212")
- (red-l . "#ff7254")
- (magenta-1bg . "#292d3c")
- (magenta-1fg . "#d16c96")
- (magenta-2bg . "#512c46")
- (magenta-2fg . "#cd809f")
- (magenta-d . "#a81761")
- (magenta-l . "#ff75ab")
- (violet-1bg . "#103145")
- (violet-1fg . "#8589c4")
- (violet-2bg . "#213a5e")
- (violet-2fg . "#9095c4")
- (violet-d . "#3548a2")
- (violet-l . "#9b94f2")
- (blue-1bg . "#023447")
- (blue-1fg . "#649bce")
- (blue-2bg . "#004363")
- (blue-2fg . "#78a3cb")
- (blue-d . "#0069b0")
- (blue-l . "#7ebaff")
- (cyan-1bg . "#03373f")
- (cyan-1fg . "#60aca4")
- (cyan-2bg . "#004b4f")
- (cyan-2fg . "#73b0aa")
- (cyan-d . "#008981")
- (cyan-l . "#77dece")
- (green-1bg . "#1e3531")
- (green-1fg . "#97a54d")
- (green-2bg . "#354725")
- (green-2fg . "#9eaa66")
- (green-d . "#687f00")
- (green-l . "#c3d255")
- ;; palette end
- )
- "The solarized color palette alist.")
-
-(defvar solarized-light-high-contrast-palette-alist
- '(;; solarized-light-high-contrast palette
- (base03 . "#00212b")
- (base02 . "#002b37")
- (base01 . "#5d737a")
- (base00 . "#596e76")
- (base0 . "#88999b")
- (base1 . "#98a6a6")
- (base2 . "#f4eedb")
- (base3 . "#fffce9")
- (yellow . "#a67c00")
- (orange . "#bb3e06")
- (red . "#cc1f24")
- (magenta . "#c42475")
- (violet . "#5e65b6")
- (blue . "#007ec4")
- (cyan . "#11948b")
- (green . "#778c00")
- (yellow-1bg . "#f7ebcb")
- (yellow-1fg . "#7a6120")
- (yellow-2bg . "#ecd29c")
- (yellow-2fg . "#6b5a2c")
- (yellow-d . "#785700")
- (yellow-l . "#d6a549")
- (orange-1bg . "#fee2c8")
- (orange-1fg . "#8a3b1c")
- (orange-2bg . "#fabc97")
- (orange-2fg . "#793e28")
- (orange-d . "#891b00")
- (orange-l . "#ed6e3e")
- (red-1bg . "#ffe1cb")
- (red-1fg . "#952f2a")
- (red-2bg . "#ffb79f")
- (red-2fg . "#823731")
- (red-d . "#990001")
- (red-l . "#ff6243")
- (magenta-1bg . "#fce1da")
- (magenta-1fg . "#8e3160")
- (magenta-2bg . "#f9b9c4")
- (magenta-2fg . "#7a395c")
- (magenta-d . "#93004d")
- (magenta-l . "#f46495")
- (violet-1bg . "#ebe7e5")
- (violet-1fg . "#44528c")
- (violet-2bg . "#cdc8e1")
- (violet-2fg . "#3d4f7e")
- (violet-d . "#11328f")
- (violet-l . "#837bdf")
- (blue-1bg . "#e6ebe7")
- (blue-1fg . "#0a6395")
- (blue-2bg . "#bfd2e6")
- (blue-2fg . "#185b85")
- (blue-d . "#005797")
- (blue-l . "#6fa5e7")
- (cyan-1bg . "#e4efdd")
- (cyan-1fg . "#10716f")
- (cyan-2bg . "#b9ddcd")
- (cyan-2fg . "#196767")
- (cyan-d . "#006d68")
- (cyan-l . "#66c1b3")
- (green-1bg . "#eeedcb")
- (green-1fg . "#596c21")
- (green-2bg . "#d5d99d")
- (green-2fg . "#51622d")
- (green-d . "#4f6600")
- (green-l . "#a8b84b")
- ;; palette end
- )
- "The solarized color palette alist.")
-
-;;; gruvbox themes
-
-(defvar solarized-gruvbox-colors
- '(;; 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")
- ;; colors end
- )
- "The gruvbox color palette.")
-
-(defvar solarized-gruvbox-dark-color-palette-alist
- '(;; gruvbox-dark palette
- (base03 . "#282828")
- (base02 . "#32302f")
- (base01 . "#7c6f64")
- (base00 . "#282828")
- (base0 . "#a89984")
- (base1 . "#bdae93")
- (base2 . "#a89984")
- (base3 . "#fbf1c7")
- (yellow . "#d79921")
- (orange . "#d65d0e")
- (red . "#fb4933")
- (magenta . "#d3869b")
- (violet . "#b16286")
- (blue . "#458588")
- (cyan . "#689d6a")
- (green . "#98971a")
- (yellow-1bg . "#3f3528")
- (yellow-1fg . "#e2b055")
- (yellow-2bg . "#614923")
- (yellow-2fg . "#dfb566")
- (yellow-d . "#a76e00")
- (yellow-l . "#f3ac41")
- (orange-1bg . "#402e25")
- (orange-1fg . "#e48847")
- (orange-2bg . "#62351c")
- (orange-2fg . "#e2965a")
- (orange-d . "#a53600")
- (orange-l . "#f37535")
- (red-1bg . "#452e28")
- (red-1fg . "#ff815b")
- (red-2bg . "#6f3125")
- (red-2fg . "#f89169")
- (red-d . "#b21b0a")
- (red-l . "#ff6540")
- (magenta-1bg . "#3d3335")
- (magenta-1fg . "#dda3a6")
- (magenta-2bg . "#5e434a")
- (magenta-2fg . "#dbaba4")
- (magenta-d . "#9f4d64")
- (magenta-l . "#e78c9e")
- (violet-1bg . "#392f33")
- (violet-1fg . "#c68a97")
- (violet-2bg . "#523642")
- (violet-2fg . "#c89798")
- (violet-d . "#8b2a58")
- (violet-l . "#d36b91")
- (blue-1bg . "#2c3333")
- (blue-1fg . "#7da298")
- (blue-2bg . "#2d4243")
- (blue-2fg . "#90aa99")
- (blue-d . "#14676b")
- (blue-l . "#63a6a5")
- (cyan-1bg . "#2f362f")
- (cyan-1fg . "#91b382")
- (cyan-2bg . "#384a38")
- (cyan-2fg . "#9fb888")
- (cyan-d . "#2e7d33")
- (cyan-l . "#75bf6b")
- (green-1bg . "#363527")
- (green-1fg . "#b4ae51")
- (green-2bg . "#4a4821")
- (green-2fg . "#bab462")
- (green-d . "#747400")
- (green-l . "#b9b340")
- ;; palette end
- )
- "The solarized gruvbox dark palette color alist.")
-
-(defvar solarized-gruvbox-light-color-palette-alist
- '(;; gruvbox-light palette
- (base03 . "#282828")
- (base02 . "#32302f")
- (base01 . "#665c54")
- (base00 . "#7c6f64")
- (base0 . "#3c3836")
- (base1 . "#a89984")
- (base2 . "#ebdbb2")
- (base3 . "#fbf1c7")
- (yellow . "#b57614")
- (orange . "#af3a03")
- (red . "#9d0006")
- (magenta . "#d3869b")
- (violet . "#8f3f71")
- (blue . "#076678")
- (cyan . "#689d6a")
- (green . "#98971a")
- (yellow-1bg . "#f6e1af")
- (yellow-1fg . "#8c6023")
- (yellow-2bg . "#efc98b")
- (yellow-2fg . "#7f5b2d")
- (yellow-d . "#8a5100")
- (yellow-l . "#e29a3f")
- (orange-1bg . "#f7d8ab")
- (orange-1fg . "#893a18")
- (orange-2bg . "#f0b382")
- (orange-2fg . "#7e3e23")
- (orange-d . "#841900")
- (orange-l . "#df6835")
- (red-1bg . "#f5d4aa")
- (red-1fg . "#7e2115")
- (red-2bg . "#eaa67f")
- (red-2fg . "#752d21")
- (red-d . "#750000")
- (red-l . "#cf5130")
- (magenta-1bg . "#f9e4c3")
- (magenta-1fg . "#9e6b78")
- (magenta-2bg . "#f8d1c0")
- (magenta-2fg . "#8c646e")
- (magenta-d . "#9f4d64")
- (magenta-l . "#f598a7")
- (violet-1bg . "#eed8bd")
- (violet-1fg . "#713c5c")
- (violet-2bg . "#dcb3af")
- (violet-2fg . "#694058")
- (violet-d . "#6f104d")
- (violet-l . "#c2608f")
- (blue-1bg . "#dedebe")
- (blue-1fg . "#245561")
- (blue-2bg . "#b1c2b2")
- (blue-2fg . "#30535c")
- (blue-d . "#004858")
- (blue-l . "#5b919b")
- (cyan-1bg . "#e7e7bb")
- (cyan-1fg . "#577a58")
- (cyan-2bg . "#cbdaab")
- (cyan-2fg . "#556f55")
- (cyan-d . "#2e7d33")
- (cyan-l . "#82cc73")
- (green-1bg . "#f0e6b1")
- (green-1fg . "#787628")
- (green-2bg . "#e0d78f")
- (green-2fg . "#6f6c32")
- (green-d . "#747400")
- (green-l . "#c6c148")
- ;; palette end
- )
- "The solarized gruvbox light color palette alist.")
-
-(defvar solarized-zenburn-color-palette-alist
- '(;; zenburn palette
- (base03 . "#3F3F3F")
- (base02 . "#4F4F4F")
- (base01 . "#878777")
- (base00 . "#6F6F6F")
- (base0 . "#DCDCCC")
- (base1 . "#FFFFEF")
- (base2 . "#fffff6")
- (base3 . "#FFFFFD")
- (yellow . "#F0DFAF")
- (orange . "#DFAF8F")
- (red . "#CC9393")
- (magenta . "#DC8CC3")
- (violet . "#bbb0cb")
- (blue . "#8CD0D3")
- (cyan . "#93E0E3")
- (green . "#7F9F7F")
- (yellow-1bg . "#55524c")
- (yellow-1fg . "#f2e6c3")
- (yellow-2bg . "#777160")
- (yellow-2fg . "#ece2c7")
- (yellow-d . "#b6a576")
- (yellow-l . "#fff7c4")
- (orange-1bg . "#534c48")
- (orange-1fg . "#e7c4ac")
- (orange-2bg . "#726054")
- (orange-2fg . "#e4c7b4")
- (orange-d . "#ac7b5a")
- (orange-l . "#ffcaa5")
- (red-1bg . "#504948")
- (red-1fg . "#dab0af")
- (red-2bg . "#6b5656")
- (red-2fg . "#d9b8b6")
- (red-d . "#9f5c5c")
- (red-l . "#f4a9a6")
- (magenta-1bg . "#52484f")
- (magenta-1fg . "#e5acd1")
- (magenta-2bg . "#705467")
- (magenta-2fg . "#e2b5d2")
- (magenta-d . "#aa5790")
- (magenta-l . "#ffa6e0")
- (violet-1bg . "#4e4c50")
- (violet-1fg . "#ccc4d7")
- (violet-2bg . "#64606a")
- (violet-2fg . "#cec8d6")
- (violet-d . "#85749c")
- (violet-l . "#d5c3ec")
- (blue-1bg . "#495051")
- (blue-1fg . "#addbdd")
- (blue-2bg . "#556c6c")
- (blue-2fg . "#b7dada")
- (blue-d . "#57a2a4")
- (blue-l . "#a9f4f5")
- (cyan-1bg . "#4a5253")
- (cyan-1fg . "#b3e7e8")
- (cyan-2bg . "#577172")
- (cyan-2fg . "#bbe3e3")
- (cyan-d . "#5dacaf")
- (cyan-l . "#b0ffff")
- (green-1bg . "#464a46")
- (green-1fg . "#a2b8a1")
- (green-2bg . "#4f5a4e")
- (green-2fg . "#acbeab")
- (green-d . "#488249")
- (green-l . "#95d291")
- ;; palette end
- )
- "The solarized color palette alist.")
-
-(provide 'solarized-palettes)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
-;;; solarized-palettes.el ends here
diff --git a/solarized-zenburn-theme.el b/solarized-zenburn-theme.el
deleted file mode 100644
index 5a3911ec..00000000
--- a/solarized-zenburn-theme.el
+++ /dev/null
@@ -1,42 +0,0 @@
-;;; solarized-zenburn-theme.el --- Solarized Theme -*- lexical-binding: t -*-
-
-;; 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 .
-
-;;; Commentary:
-;;
-;; The dark variant of the solarized theme with a zenburn palette.
-;;
-;;; Code:
-
-(require 'solarized)
-(eval-when-compile
- (require 'solarized-palettes))
-
-(deftheme solarized-zenburn
- "The dark variant of the Solarized colour theme with gruvbox color palette")
-
-(solarized-with-color-variables 'dark 'solarized-zenburn
- solarized-zenburn-color-palette-alist)
-
-(provide-theme 'solarized-zenburn)
-
-(provide 'solarized-zenburn-theme)
-
-;; Local Variables:
-;; indent-tabs-mode: nil
-;; End:
-
-;;; solarized-zenburn-theme.el ends here