From 43b2116713c6fc84740b6a0509d33cba32045167 Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jdkaplan@metagram.net>
Date: Mon, 24 Dec 2018 14:39:26 -0800
Subject: [PATCH] kakoune themes

---
 kak/colors/base16-default-light.kak |  77 +++++++++++++++
 kak/colors/jdkaplan-light.kak       | 139 ++++++++++++++--------------
 2 files changed, 146 insertions(+), 70 deletions(-)
 create mode 100644 kak/colors/base16-default-light.kak

diff --git a/kak/colors/base16-default-light.kak b/kak/colors/base16-default-light.kak
new file mode 100644
index 0000000..348da1d
--- /dev/null
+++ b/kak/colors/base16-default-light.kak
@@ -0,0 +1,77 @@
+## Adapted from https://raw.githubusercontent.com/leira/base16-kakoune/cda1583edc4eae387c17eb37f195496aa21ace2a/colors/base16-default-light.kak
+
+evaluate-commands %sh{
+    base00='rgb:f8f8f8'
+    base01='rgb:e8e8e8'
+    base02='rgb:d8d8d8'
+    base03='rgb:b8b8b8'
+    base04='rgb:585858'
+    base05='rgb:383838'
+    base06='rgb:282828'
+    base07='rgb:181818'
+    base08='rgb:ab4642' # red
+    base09='rgb:dc9656' # orange
+    base0A='rgb:f7ca88' # yellow-orange
+    base0B='rgb:a1b56c' # green-brown
+    base0C='rgb:86c1b9' # teal
+    base0D='rgb:7cafc2' # blue
+    base0E='rgb:ba8baf' # purple
+    base0F='rgb:a16946' # brown
+
+    ## code
+    echo "
+        face global attribute ${base0C}
+        face global builtin ${base0D}
+        face global comment ${base03}
+        face global identifier ${base08}
+        face global function ${base0D}
+        face global keyword ${base0E}+b
+        face global meta ${base0D}
+        face global module ${base0E}
+        face global operator ${base05}
+        face global string ${base0B}
+        face global type ${base0A}+b
+        face global value ${base09}
+        face global variable ${base08}
+    "
+
+    ## markup
+    echo "
+        face global block ${base0C}
+        face global bold ${base0A}+b
+        face global bullet ${base08}
+        face global header ${base0D}+b
+        face global italic ${base0E}
+        face global link ${base09}
+        face global list ${base08}
+        face global mono ${base0B}
+        face global title ${base0D}+b
+    "
+
+    ## builtin
+    echo "
+        face global BufferPadding ${base03},${base00}
+        face global Default ${base05},${base00}
+        face global Error ${base00},${base08}
+        face global Information ${base00},${base0A}
+        face global LineNumberCursor ${base0A},${base00}
+        face global LineNumbers ${base02},${base00}
+        face global MatchingChar ${base06},${base02}+b
+        face global MenuBackground ${base00},${base0C}
+        face global MenuForeground ${base00},${base0D}
+        face global MenuInfo ${base02}
+        face global PrimaryCursor ${base00},${base05}
+        face global PrimaryCursorEol ${base00},${base03}+fg
+        face global PrimarySelection ${base06},${base0D}
+        face global Prompt ${base0D},${base01}
+        face global SecondaryCursor ${base06},${base03}
+        face global SecondaryCursorEol ${base06},${base02}+fg
+        face global SecondarySelection ${base06},${base01}
+        face global StatusCursor ${base00},${base05}
+        face global StatusLine ${base04},${base01}
+        face global StatusLineInfo ${base0D}
+        face global StatusLineMode ${base0B}
+        face global StatusLineValue ${base0C}
+        face global Whitespace ${base0F}+f
+    "
+}
diff --git a/kak/colors/jdkaplan-light.kak b/kak/colors/jdkaplan-light.kak
index 9662cda..3ca5176 100644
--- a/kak/colors/jdkaplan-light.kak
+++ b/kak/colors/jdkaplan-light.kak
@@ -1,76 +1,75 @@
 evaluate-commands %sh{
-    foreground="black"
-    fg_01="rgb:262626"      
-    fg_02="rgb:3A3A3A"      
-    fg_03="rgb:444444"      
-    fg_04="rgb:585858"      
-    fg_05="rgb:6C6C6C"      
-
-    bg_05="rgb:808080"      
-    bg_04="rgb:8A8A8A"      
-    bg_03="rgb:AFAFAF"      
-    bg_02="rgb:E4E4E4"      
-    bg_01="rgb:EEEEEE"      
-    background="white"
-
-    literal="rgb:FF8700"       
-    matching_char="rgb:FF875F+b"  
-    string="rgb:A78000" 
-    type="rgb:D70000"       
-    keyword="rgb:119300"
-    variable="rgb:007D93"         
-    meta="rgb:AF87FF"       
+    base00='rgb:f8f8f8'
+    base01='rgb:e8e8e8'
+    base02='rgb:d8d8d8'
+    base03='rgb:b8b8b8'
+    base04='rgb:585858'
+    base05='rgb:383838'
+    base06='rgb:282828'
+    base07='rgb:181818'
+    base08='rgb:7cafc2' # blue
+    base09='rgb:ba8baf' # purple
+    base0A='rgb:f7ba5d' # yellow-orange
+    base0B='rgb:d88c47' # orange
+    base0C='rgb:8c5432' # brown
+    base0D='rgb:5189a0' # teal
+    base0E='rgb:9bb556' # green-brown
+    base0F='rgb:bc150f' # red
 
+    ## code
     echo "
-# For Code
-face global value     ${literal}
-face global type      ${type}
-face global variable  ${variable}
-face global module    ${keyword}
-face global function  ${variable}
-face global string    ${string}
-face global keyword   ${keyword}
-face global operator  ${keyword}
-face global attribute ${variable}
-face global comment   ${bg_05}
-face global meta      ${keyword}
-face global builtin   ${foreground}
+        face global attribute ${base0C}
+        face global builtin ${base0D}
+        face global comment ${base03}
+        face global identifier ${base08}
+        face global function ${base0D}
+        face global keyword ${base0E}+b
+        face global meta ${base0D}
+        face global module ${base0E}
+        face global operator ${base05}
+        face global string ${base0B}
+        face global type ${base0A}+b
+        face global value ${base09}
+        face global variable ${base08}
+    "
 
-# For markup
-face global title  +u
-# face global header default
-face global bold   +b
-face global italic +i
-# face global mono   default
-# face global block  default
-# face global link   default
-# face global bullet default
-# face global list   default
+    ## markup
+    echo "
+        face global block ${base0C}
+        face global bold ${base0A}+b
+        face global bullet ${base08}
+        face global header ${base0D}+b
+        face global italic ${base0E}
+        face global link ${base09}
+        face global list ${base08}
+        face global mono ${base0B}
+        face global title ${base0D}+b
+    "
 
-# builtin faces
-face global Default            ${fg_01},${bg_01}
-face global PrimaryCursor      ${background},${foreground}
-face global PrimarySelection   ${background},${fg_05}
-face global SecondaryCursor    ${foreground},${bg_04}
-face global SecondarySelection ${foreground},${bg_02}
-face global PrimaryCursorEol   ${background},${foreground}
-face global SecondaryCursorEol ${background},${bg_04}
-face global LineNumbers        ${fg_04},default
-face global LineNumberCursor   ${fg_04},default
-face global LineNumbersWrapped ${bg_01},${bg_01}
-face global MenuForeground     white,blue
-face global MenuBackground     blue,white
-face global MenuInfo           cyan
-face global Information        black,yellow
-face global Error              black,red
-face global StatusLine         ${fg_01},${bg_03}
-face global StatusLineMode     ${fg_01},${bg_03}
-face global StatusLineInfo     ${fg_01},${bg_03}
-face global StatusLineValue    ${fg_01},${bg_03}
-
-# face global StatusCursor       black,cyan
-# face global Prompt             yellow,default
-face global MatchingChar       ${matching_char}
-face global BufferPadding      ${fg_05},${bg_02}
-"
+    ## builtin
+    echo "
+        face global BufferPadding ${base03},${base00}
+        face global Default ${base05},${base00}
+        face global Error ${base00},${base08}
+        face global Information ${base00},${base0A}
+        face global LineNumberCursor ${base0A},${base00}
+        face global LineNumbers ${base02},${base00}
+        face global MatchingChar ${base06},${base02}+b
+        face global MenuBackground ${base00},${base0C}
+        face global MenuForeground ${base00},${base0D}
+        face global MenuInfo ${base02}
+        face global PrimaryCursor ${base00},${base05}
+        face global PrimaryCursorEol ${base00},${base03}+fg
+        face global PrimarySelection ${base06},${base0D}
+        face global Prompt ${base0D},${base01}
+        face global SecondaryCursor ${base06},${base03}
+        face global SecondaryCursorEol ${base06},${base02}+fg
+        face global SecondarySelection ${base06},${base01}
+        face global StatusCursor ${base00},${base05}
+        face global StatusLine ${base04},${base01}
+        face global StatusLineInfo ${base0D}
+        face global StatusLineMode ${base0B}
+        face global StatusLineValue ${base0C}
+        face global Whitespace ${base0F}+f
+    "
 }