Build color components separately and combine into default with partials

6 files changed, 36 insertions, 42 deletions

diff --git a/README.md b/README.md
index daeecb8..b4839fd 100644
--- a/README.md
+++ b/README.md
@@ -38,3 +38,6 @@ $ curl https://raw.githubusercontent.com/khamer/base16-i3/master/colors/base16-d
 ```
 
 And hit **$mod + Shift + c** to load in the new colors.
+
+You can also fetch the separate bar colors and client properties sections of
+the full config from the `bar-colors` and `client-properties` directories.
diff --git a/templates/bar-colors.mustache b/templates/bar-colors.mustache
new file mode 100644
index 0000000..fd5ed89
--- /dev/null
+++ b/templates/bar-colors.mustache
@@ -0,0 +1,12 @@
+colors {
+    background $base00
+    separator  $base01
+    statusline $base04
+
+    # State             Border  BG      Text
+    focused_workspace   $base05 $base0D $base00
+    active_workspace    $base05 $base03 $base00
+    inactive_workspace  $base03 $base01 $base05
+    urgent_workspace    $base08 $base08 $base00
+    binding_mode        $base00 $base0A $base00
+}
diff --git a/templates/client-properties.mustache b/templates/client-properties.mustache
new file mode 100644
index 0000000..525b833
--- /dev/null
+++ b/templates/client-properties.mustache
@@ -0,0 +1,8 @@
+# Basic color configuration using the Base16 variables for windows and borders.
+# Property Name         Border  BG      Text    Indicator Child Border
+client.focused          $base05 $base0D $base00 $base0D $base0D
+client.focused_inactive $base01 $base01 $base05 $base03 $base01
+client.unfocused        $base01 $base00 $base05 $base01 $base01
+client.urgent           $base08 $base08 $base00 $base08 $base08
+client.placeholder      $base00 $base00 $base05 $base00 $base00
+client.background       $base07
diff --git a/templates/colors-only.mustache b/templates/colors.mustache
index 5385b19..5385b19 100644
--- a/templates/colors-only.mustache
+++ b/templates/colors.mustache
diff --git a/templates/config.yaml b/templates/config.yaml
index d110e64..a44f88c 100644
--- a/templates/config.yaml
+++ b/templates/config.yaml
@@ -1,6 +1,15 @@
 default:
     extension: .config
     output: themes
-colors-only:
+
+bar-colors:
+    extension: .config
+    output: bar-colors
+
+client-properties:
+    extension: .config
+    output: client-properties
+
+colors:
     extension: .config
     output: colors
diff --git a/templates/default.mustache b/templates/default.mustache
index 4ec3823..13932b0 100644
--- a/templates/default.mustache
+++ b/templates/default.mustache
@@ -1,48 +1,10 @@
-## Base16 {{scheme-name}}
-# Author: {{scheme-author}}
-#
-# You can use these variables anywhere in the i3 configuration file.
-
-set $base00 #{{base00-hex}}
-set $base01 #{{base01-hex}}
-set $base02 #{{base02-hex}}
-set $base03 #{{base03-hex}}
-set $base04 #{{base04-hex}}
-set $base05 #{{base05-hex}}
-set $base06 #{{base06-hex}}
-set $base07 #{{base07-hex}}
-set $base08 #{{base08-hex}}
-set $base09 #{{base09-hex}}
-set $base0A #{{base0A-hex}}
-set $base0B #{{base0B-hex}}
-set $base0C #{{base0C-hex}}
-set $base0D #{{base0D-hex}}
-set $base0E #{{base0E-hex}}
-set $base0F #{{base0F-hex}}
+{{> colors }}
 
 # Basic bar configuration using the Base16 variables.
 bar {
     status_command i3status
 
-    colors {
-        background $base00
-        separator  $base01
-        statusline $base04
-
-        # State             Border  BG      Text
-        focused_workspace   $base05 $base0D $base00
-        active_workspace    $base05 $base03 $base00
-        inactive_workspace  $base03 $base01 $base05
-        urgent_workspace    $base08 $base08 $base00
-        binding_mode        $base00 $base0A $base00
-    }
+    {{> bar-colors }}
 }
 
-# Basic color configuration using the Base16 variables for windows and borders.
-# Property Name         Border  BG      Text    Indicator Child Border
-client.focused          $base05 $base0D $base00 $base0D $base0D
-client.focused_inactive $base01 $base01 $base05 $base03 $base01
-client.unfocused        $base01 $base00 $base05 $base01 $base01
-client.urgent           $base08 $base08 $base00 $base08 $base08
-client.placeholder      $base00 $base00 $base05 $base00 $base00
-client.background       $base07
+{{> client-properties }}