Split package into multiple packages

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
 

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
 

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)

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 <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")
+
+(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

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 <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")
+
+(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

solarized-wombat-dark-theme.el → 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")