flavours: bring colors into dotfiles

and fix accents and font

Signed-off-by: Robert Günzler <r@gnzler.io>

10 files changed, 46 insertions, 27 deletions

diff --git a/.config/flavours/change_font.sh b/.config/flavours/change_font.sh
index 42781eb..79f34a8 100644
--- a/.config/flavours/change_font.sh
+++ b/.config/flavours/change_font.sh
@@ -2,7 +2,7 @@
 set -ex
 
 UIFONT="Iosevka Etoile"
-MONOFONT="DejaVu Sans Mono"
+MONOFONT="Iosevka SS04 Extended"
 
 fd 'hibiki.mustache.in' \
 	-x sh -c "sed -e 's,@uifont@,$UIFONT,g' -e 's,@monofont@,$MONOFONT,g' {} >{.}"
diff --git a/.config/flavours/schemes/karafuru/karafuru.yaml b/.config/flavours/schemes/karafuru/karafuru.yaml
index 2794599..acdac6f 120000..100644
--- a/.config/flavours/schemes/karafuru/karafuru.yaml
+++ b/.config/flavours/schemes/karafuru/karafuru.yaml
@@ -1 +1,20 @@
-/home/robert/src/karafuru/base16-karafuru-dark.yaml
\ No newline at end of file
+scheme: "Karafuru Dark"
+author: "robertgzr"
+
+base00: "1c1c1c"
+base01: "db4d6d"
+base02: "5dac81"
+base03: "fad689"
+base04: "58b2dc"
+base05: "70649a"
+base06: "69b0ac"
+base07: "bdc0ba"
+
+base08: "4f4f48"
+base09: "cb1b45"
+base0A: "86c166"
+base0B: "f7d94c"
+base0C: "2ea9df"
+base0D: "8a6bbe"
+base0E: "81c7d4"
+base0F: "fffffb"
diff --git a/.config/flavours/templates/bemenu/templates/hibiki.mustache b/.config/flavours/templates/bemenu/templates/hibiki.mustache
index 7c1d8a1..433aeb3 100644
--- a/.config/flavours/templates/bemenu/templates/hibiki.mustache
+++ b/.config/flavours/templates/bemenu/templates/hibiki.mustache
@@ -1,12 +1,12 @@
---fn \"DejaVu Sans Mono 10\"
+--fn \"Iosevka SS04 Extended 10\"
 # normal
 --nb "#{{base00-hex}}"
 --nf "#{{base07-hex}}"
 # alternate
---ab "#{{base00-hex}}" # "#{{base03-hex}}"
+--ab "#{{base00-hex}}"
 --af "#{{base07-hex}}"
 # title
---tb "#{{base06-hex}}"
+--tb "#{{base05-hex}}"
 --tf "#{{base07-hex}}"
 # filter
 --fb "#{{base00-hex}}"
@@ -15,13 +15,13 @@
 --sb "#{{base0A-hex}}"
 --sf "#{{base00-hex}}"
 # highlighted
---hb "#{{base06-hex}}"
+--hb "#{{base05-hex}}"
 --hf "#{{base07-hex}}"
 # scrollbar
 --scb "#{{base00-hex}}"
---scf "#{{base03-hex}}"
+--scf "#{{base08-hex}}"
 # border
---bdr "#{{base06-hex}}"
+--bdr "#{{base05-hex}}"
 # feedback
 --fbb "#{{base09-hex}}"
---fbf "#{{base06-hex}}"
+--fbf "#{{base05-hex}}"
diff --git a/.config/flavours/templates/bemenu/templates/hibiki.mustache.in b/.config/flavours/templates/bemenu/templates/hibiki.mustache.in
index 8d0b077..bb11b38 100644
--- a/.config/flavours/templates/bemenu/templates/hibiki.mustache.in
+++ b/.config/flavours/templates/bemenu/templates/hibiki.mustache.in
@@ -3,10 +3,10 @@
 --nb "#{{base00-hex}}"
 --nf "#{{base07-hex}}"
 # alternate
---ab "#{{base00-hex}}" # "#{{base03-hex}}"
+--ab "#{{base00-hex}}"
 --af "#{{base07-hex}}"
 # title
---tb "#{{base06-hex}}"
+--tb "#{{base05-hex}}"
 --tf "#{{base07-hex}}"
 # filter
 --fb "#{{base00-hex}}"
@@ -15,13 +15,13 @@
 --sb "#{{base0A-hex}}"
 --sf "#{{base00-hex}}"
 # highlighted
---hb "#{{base06-hex}}"
+--hb "#{{base05-hex}}"
 --hf "#{{base07-hex}}"
 # scrollbar
 --scb "#{{base00-hex}}"
---scf "#{{base03-hex}}"
+--scf "#{{base08-hex}}"
 # border
---bdr "#{{base06-hex}}"
+--bdr "#{{base05-hex}}"
 # feedback
 --fbb "#{{base09-hex}}"
---fbf "#{{base06-hex}}"
+--fbf "#{{base05-hex}}"
diff --git a/.config/flavours/templates/foot/templates/hibiki.mustache b/.config/flavours/templates/foot/templates/hibiki.mustache
index 9dcff93..3dc4df2 100644
--- a/.config/flavours/templates/foot/templates/hibiki.mustache
+++ b/.config/flavours/templates/foot/templates/hibiki.mustache
@@ -1,7 +1,7 @@
 # Base16 Karafuru Dark - foot color config
 # robertgzr
 
-font=DejaVu Sans Mono:size=11,Sarasa Fixed J:size=12,Noto Emoji,Material Design Icons Desktop # {{monofont}}
+font=Iosevka SS04 Extended:size=11,Sarasa Fixed J:size=12,Noto Emoji,Material Design Icons Desktop
 
 [colors]
 background={{base00-hex}}
diff --git a/.config/flavours/templates/foot/templates/hibiki.mustache.in b/.config/flavours/templates/foot/templates/hibiki.mustache.in
index 05a87da..7cb3b6a 100644
--- a/.config/flavours/templates/foot/templates/hibiki.mustache.in
+++ b/.config/flavours/templates/foot/templates/hibiki.mustache.in
@@ -1,7 +1,7 @@
 # Base16 Karafuru Dark - foot color config
 # robertgzr
 
-font=@monofont@:size=11,Sarasa Fixed J:size=12,Noto Emoji,Material Design Icons Desktop # {{monofont}}
+font=@monofont@:size=11,Sarasa Fixed J:size=12,Noto Emoji,Material Design Icons Desktop
 
 [colors]
 background={{base00-hex}}
diff --git a/.config/flavours/templates/mako/templates/hibiki.mustache b/.config/flavours/templates/mako/templates/hibiki.mustache
index 3b23d87..d14ea03 100644
--- a/.config/flavours/templates/mako/templates/hibiki.mustache
+++ b/.config/flavours/templates/mako/templates/hibiki.mustache
@@ -1,5 +1,5 @@
 font=Iosevka Etoile 10
 background-color=#{{base00-hex}}
 text-color=#{{base0F-hex}}
-border-color=#{{base06-hex}}dd
-progress-color=source #{{base06-hex}}dd
+border-color=#{{base05-hex}}dd
+progress-color=source #{{base05-hex}}dd
diff --git a/.config/flavours/templates/mako/templates/hibiki.mustache.in b/.config/flavours/templates/mako/templates/hibiki.mustache.in
index 238e23e..c7632b5 100644
--- a/.config/flavours/templates/mako/templates/hibiki.mustache.in
+++ b/.config/flavours/templates/mako/templates/hibiki.mustache.in
@@ -1,5 +1,5 @@
 font=@uifont@ 10
 background-color=#{{base00-hex}}
 text-color=#{{base0F-hex}}
-border-color=#{{base06-hex}}dd
-progress-color=source #{{base06-hex}}dd
+border-color=#{{base05-hex}}dd
+progress-color=source #{{base05-hex}}dd
diff --git a/.config/flavours/templates/sway/templates/hibiki.mustache b/.config/flavours/templates/sway/templates/hibiki.mustache
index 02291b3..77487cc 100644
--- a/.config/flavours/templates/sway/templates/hibiki.mustache
+++ b/.config/flavours/templates/sway/templates/hibiki.mustache
@@ -4,10 +4,10 @@ font pango:Iosevka Etoile 9
 
 set $text              #{{base0F-hex}}
 set $text2             #{{base07-hex}}
-set $bg                #{{base08-hex}}
+set $bg                #{{base00-hex}}
 set $bg2               #{{base05-hex}}
-set $main              #{{base06-hex}}
-set $main2             #{{base0E-hex}}
+set $main              #{{base05-hex}}
+set $main2             #{{base0D-hex}}
 set $urgent            #{{base09-hex}}
 set $urgent2           #{{base01-hex}}
 set $indicator         $text2
diff --git a/.config/flavours/templates/sway/templates/hibiki.mustache.in b/.config/flavours/templates/sway/templates/hibiki.mustache.in
index 53c246b..9b1b331 100644
--- a/.config/flavours/templates/sway/templates/hibiki.mustache.in
+++ b/.config/flavours/templates/sway/templates/hibiki.mustache.in
@@ -4,10 +4,10 @@ font pango:@uifont@ 9
 
 set $text              #{{base0F-hex}}
 set $text2             #{{base07-hex}}
-set $bg                #{{base08-hex}}
+set $bg                #{{base00-hex}}
 set $bg2               #{{base05-hex}}
-set $main              #{{base06-hex}}
-set $main2             #{{base0E-hex}}
+set $main              #{{base05-hex}}
+set $main2             #{{base0D-hex}}
 set $urgent            #{{base09-hex}}
 set $urgent2           #{{base01-hex}}
 set $indicator         $text2