Simplify generated kak file and also change faces for cursors and com…

README.md

@@ -4,7 +4,7 @@ Base16 (https://github.com/chriskempson/base16) for Kakoune (https://github.com/
 ## Installation
 
 ```sh
-git clone git://github.com/leira/base16-kakoune.git
+git clone git://github.com/danr/base16-kakoune.git
 cp base16-kakoune/colors/*.kak ~/.config/kak/colors/
 ```
 

colors/base16-3024.kak

@@ -1,73 +1,84 @@
 ## base16-kakoune (https://github.com/leira/base16-kakoune)
 ## by Leira Hua
-## 3024 scheme by Jan T. Sott (http://github.com/idleberg)
+## 3024 scheme by Jan T. Sott (http://github.com/idleberg)
 
-%sh{
-    base00='rgb:090300'
-    base01='rgb:3a3432'
-    base02='rgb:4a4543'
-    base03='rgb:5c5855'
-    base04='rgb:807d7c'
-    base05='rgb:a5a2a2'
-    base06='rgb:d6d5d4'
-    base07='rgb:f7f7f7'
-    base08='rgb:db2d20'
-    base09='rgb:e8bbd0'
-    base0A='rgb:fded02'
-    base0B='rgb:01a252'
-    base0C='rgb:b5e4f4'
-    base0D='rgb:01a0e4'
-    base0E='rgb:a16a94'
-    base0F='rgb:cdab53'
+try %{
+    decl str base00
+    decl str base01
+    decl str base02
+    decl str base03
+    decl str base04
+    decl str base05
+    decl str base06
+    decl str base07
+    decl str base08
+    decl str base09
+    decl str base0A
+    decl str base0B
+    decl str base0C
+    decl str base0D
+    decl str base0E
+    decl str base0F
+}
 
-    ## code
-    echo "
-        face value ${base09}
-        face type ${base0A}+b
-        face identifier ${base08}
-        face string ${base0B}
-        face keyword ${base0E}+b
-        face operator ${base05}
-        face attribute ${base0C}
-        face comment ${base03}
-        face meta ${base0D}
-        face builtin ${base0D}+b
-    "
+set global base00 rgb:090300
+set global base01 rgb:3a3432
+set global base02 rgb:4a4543
+set global base03 rgb:5c5855
+set global base04 rgb:807d7c
+set global base05 rgb:a5a2a2
+set global base06 rgb:d6d5d4
+set global base07 rgb:f7f7f7
+set global base08 rgb:db2d20
+set global base09 rgb:e8bbd0
+set global base0A rgb:fded02
+set global base0B rgb:01a252
+set global base0C rgb:b5e4f4
+set global base0D rgb:01a0e4
+set global base0E rgb:a16a94
+set global base0F rgb:cdab53
 
-    ## markup
-    echo "
-        face title ${base0D}+b
-        face header ${base0D}+b
-        face bold ${base0A}+b
-        face italic ${base0E}
-        face mono ${base0B}
-        face block ${base0C}
-        face link ${base09}
-        face bullet ${base08}
-        face list ${base08}
-    "
+## code
+face global value              "%opt{base09},%opt{base00}"
+face global type               "%opt{base0A},%opt{base00}"
+face global identifier         "%opt{base08},%opt{base00}"
+face global string             "%opt{base0B},%opt{base00}"
+face global keyword            "%opt{base0E},%opt{base00}"
+face global operator           "%opt{base05},%opt{base00}"
+face global attribute          "%opt{base0C},%opt{base00}"
+face global comment            "%opt{base0C},%opt{base00}"
+face global meta               "%opt{base0D},%opt{base00}"
+face global builtin            "%opt{base0D},%opt{base00}+b"
 
-    ## builtin
-    echo "
-        face Default ${base05},${base00}
-        face PrimarySelection ${base06},${base0D}
-        face SecondarySelection ${base06},${base0F}
-        face PrimaryCursor ${base00},${base05}
-        face SecondaryCursor ${base06},${base0C}
-        face LineNumbers ${base02},${base00}
-        face LineNumberCursor ${base0A},${base00}
-        face MenuForeground ${base00},${base0D}
-        face MenuBackground ${base00},${base0C}
-        face MenuInfo ${base02}
-        face Information ${base00},${base0A}
-        face Error ${base00},${base08}
-        face StatusLine ${base04},${base01}
-        face StatusLineMode ${base0B}
-        face StatusLineInfo ${base0D}
-        face StatusLineValue ${base0C}
-        face StatusCursor ${base00},${base05}
-        face Prompt ${base0D},${base01}
-        face MatchingChar ${base06},${base02}+b
-        face BufferPadding ${base03},${base00}
-    "
-}
+## markup
+face global title              "%opt{base0D},%opt{base00}+b"
+face global header             "%opt{base0D},%opt{base00}+b"
+face global bold               "%opt{base0A},%opt{base00}+b"
+face global italic             "%opt{base0E},%opt{base00}"
+face global mono               "%opt{base0B},%opt{base00}"
+face global block              "%opt{base0C},%opt{base00}"
+face global link               "%opt{base09},%opt{base00}"
+face global bullet             "%opt{base08},%opt{base00}"
+face global list               "%opt{base08},%opt{base00}"
+
+## builtin
+face global Default            "%opt{base05},%opt{base00}"
+face global PrimaryCursor      "%opt{base00},%opt{base0E}"
+face global PrimarySelection   "%opt{base00},%opt{base0C}"
+face global SecondaryCursor    "%opt{base00},%opt{base05}"
+face global SecondarySelection "%opt{base00},%opt{base04}"
+face global LineNumbers        "%opt{base02},%opt{base00}"
+face global LineNumberCursor   "%opt{base0A},%opt{base00}"
+face global MenuForeground     "%opt{base00},%opt{base0D}"
+face global MenuBackground     "%opt{base00},%opt{base0C}"
+face global MenuInfo           "%opt{base02},%opt{base0C}"
+face global Information        "%opt{base00},%opt{base0A}"
+face global Error              "%opt{base00},%opt{base08}"
+face global StatusLine         "%opt{base04},%opt{base01}"
+face global StatusLineMode     "%opt{base0B},%opt{base01}"
+face global StatusLineInfo     "%opt{base0D},%opt{base01}"
+face global StatusLineValue    "%opt{base0C},%opt{base01}"
+face global StatusCursor       "%opt{base00},%opt{base05}"
+face global Prompt             "%opt{base0D},%opt{base01}"
+face global MatchingChar       "%opt{base06},%opt{base02}+b"
+face global BufferPadding      "%opt{base03},%opt{base00}"

colors/base16-apathy.kak

@@ -1,73 +1,84 @@
 ## base16-kakoune (https://github.com/leira/base16-kakoune)
 ## by Leira Hua
-## Apathy scheme by Jannik Siebert (https://github.com/janniks)
+## Apathy scheme by Jannik Siebert (https://github.com/janniks)
 
-%sh{
-    base00='rgb:031A16'
-    base01='rgb:0B342D'
-    base02='rgb:184E45'
-    base03='rgb:2B685E'
-    base04='rgb:5F9C92'
-    base05='rgb:81B5AC'
-    base06='rgb:A7CEC8'
-    base07='rgb:D2E7E4'
-    base08='rgb:3E9688'
-    base09='rgb:3E7996'
-    base0A='rgb:3E4C96'
-    base0B='rgb:883E96'
-    base0C='rgb:963E4C'
-    base0D='rgb:96883E'
-    base0E='rgb:4C963E'
-    base0F='rgb:3E965B'
+try %{
+    decl str base00
+    decl str base01
+    decl str base02
+    decl str base03
+    decl str base04
+    decl str base05
+    decl str base06
+    decl str base07
+    decl str base08
+    decl str base09
+    decl str base0A
+    decl str base0B
+    decl str base0C
+    decl str base0D
+    decl str base0E
+    decl str base0F
+}
 
-    ## code
-    echo "
-        face value ${base09}
-        face type ${base0A}+b
-        face identifier ${base08}
-        face string ${base0B}
-        face keyword ${base0E}+b
-        face operator ${base05}
-        face attribute ${base0C}
-        face comment ${base03}
-        face meta ${base0D}
-        face builtin ${base0D}+b
-    "
+set global base00 rgb:031A16
+set global base01 rgb:0B342D
+set global base02 rgb:184E45
+set global base03 rgb:2B685E
+set global base04 rgb:5F9C92
+set global base05 rgb:81B5AC
+set global base06 rgb:A7CEC8
+set global base07 rgb:D2E7E4
+set global base08 rgb:3E9688
+set global base09 rgb:3E7996
+set global base0A rgb:3E4C96
+set global base0B rgb:883E96
+set global base0C rgb:963E4C
+set global base0D rgb:96883E
+set global base0E rgb:4C963E
+set global base0F rgb:3E965B
 
-    ## markup
-    echo "
-        face title ${base0D}+b
-        face header ${base0D}+b
-        face bold ${base0A}+b
-        face italic ${base0E}
-        face mono ${base0B}
-        face block ${base0C}
-        face link ${base09}
-        face bullet ${base08}
-        face list ${base08}
-    "
+## code
+face global value              "%opt{base09},%opt{base00}"
+face global type               "%opt{base0A},%opt{base00}"
+face global identifier         "%opt{base08},%opt{base00}"
+face global string             "%opt{base0B},%opt{base00}"
+face global keyword            "%opt{base0E},%opt{base00}"
+face global operator           "%opt{base05},%opt{base00}"
+face global attribute          "%opt{base0C},%opt{base00}"
+face global comment            "%opt{base0C},%opt{base00}"
+face global meta               "%opt{base0D},%opt{base00}"
+face global builtin            "%opt{base0D},%opt{base00}+b"
 
-    ## builtin
-    echo "
-        face Default ${base05},${base00}
-        face PrimarySelection ${base06},${base0D}
-        face SecondarySelection ${base06},${base0F}
-        face PrimaryCursor ${base00},${base05}
-        face SecondaryCursor ${base06},${base0C}
-        face LineNumbers ${base02},${base00}
-        face LineNumberCursor ${base0A},${base00}
-        face MenuForeground ${base00},${base0D}
-        face MenuBackground ${base00},${base0C}
-        face MenuInfo ${base02}
-        face Information ${base00},${base0A}
-        face Error ${base00},${base08}
-        face StatusLine ${base04},${base01}
-        face StatusLineMode ${base0B}
-        face StatusLineInfo ${base0D}
-        face StatusLineValue ${base0C}
-        face StatusCursor ${base00},${base05}
-        face Prompt ${base0D},${base01}
-        face MatchingChar ${base06},${base02}+b
-        face BufferPadding ${base03},${base00}
-    "
-}
+## markup
+face global title              "%opt{base0D},%opt{base00}+b"
+face global header             "%opt{base0D},%opt{base00}+b"
+face global bold               "%opt{base0A},%opt{base00}+b"
+face global italic             "%opt{base0E},%opt{base00}"
+face global mono               "%opt{base0B},%opt{base00}"
+face global block              "%opt{base0C},%opt{base00}"
+face global link               "%opt{base09},%opt{base00}"
+face global bullet             "%opt{base08},%opt{base00}"
+face global list               "%opt{base08},%opt{base00}"
+
+## builtin
+face global Default            "%opt{base05},%opt{base00}"
+face global PrimaryCursor      "%opt{base00},%opt{base0E}"
+face global PrimarySelection   "%opt{base00},%opt{base0C}"
+face global SecondaryCursor    "%opt{base00},%opt{base05}"
+face global SecondarySelection "%opt{base00},%opt{base04}"
+face global LineNumbers        "%opt{base02},%opt{base00}"
+face global LineNumberCursor   "%opt{base0A},%opt{base00}"
+face global MenuForeground     "%opt{base00},%opt{base0D}"
+face global MenuBackground     "%opt{base00},%opt{base0C}"
+face global MenuInfo           "%opt{base02},%opt{base0C}"
+face global Information        "%opt{base00},%opt{base0A}"
+face global Error              "%opt{base00},%opt{base08}"
+face global StatusLine         "%opt{base04},%opt{base01}"
+face global StatusLineMode     "%opt{base0B},%opt{base01}"
+face global StatusLineInfo     "%opt{base0D},%opt{base01}"
+face global StatusLineValue    "%opt{base0C},%opt{base01}"
+face global StatusCursor       "%opt{base00},%opt{base05}"
+face global Prompt             "%opt{base0D},%opt{base01}"
+face global MatchingChar       "%opt{base06},%opt{base02}+b"
+face global BufferPadding      "%opt{base03},%opt{base00}"