flavours: control font setting centrally

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

15 files changed, 267 insertions, 16 deletions

diff --git a/.config/flavours/change_font.sh b/.config/flavours/change_font.sh
new file mode 100644
index 0000000..42781eb
--- /dev/null
+++ b/.config/flavours/change_font.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -ex
+
+UIFONT="Iosevka Etoile"
+MONOFONT="DejaVu Sans Mono"
+
+fd 'hibiki.mustache.in' \
+	-x sh -c "sed -e 's,@uifont@,$UIFONT,g' -e 's,@monofont@,$MONOFONT,g' {} >{.}"
diff --git a/.config/flavours/config.toml b/.config/flavours/config.toml
index 6be7f6f..e12acc1 100644
--- a/.config/flavours/config.toml
+++ b/.config/flavours/config.toml
@@ -2,12 +2,15 @@ shell = "bash -c '{}'"
 
 [[items]]
 template = "waybar"
-file = "~/.config/waybar/colors.css"
-rewrite = true
+subtemplate = "hibiki"
+file = "~/.config/waybar/style.css"
+start = "/* start flavours */"
+end = "/* end flavours */"
 hook = "doas -n s6-svc -r /run/s6-rc/servicedirs/waybar-srv/"
 
 [[items]]
 template = "foot"
+subtemplate = "hibiki"
 file = "~/.config/foot/colors.ini"
 rewrite = true
 #hook = "doas -n s6-svc -r /run/s6-rc/servicedirs/footserver-srv/"
@@ -15,13 +18,37 @@ rewrite = true
 [[items]]
 template = "sway"
 subtemplate = "hibiki"
-rewrite = true
 file = "~/.config/sway/config.d/colors.conf"
+rewrite = true
 hook = "swaymsg reload"
+light = false
 
 [[items]]
 template = "vimiv"
 subtemplate = "hibiki"
+file = "~/.config/vimiv/styles/base16"
 start = "; start flavours"
 end = "; end flavours"
-file = "~/.config/vimiv/styles/base16"
+
+[[items]]
+template = "bemenu"
+subtemplate = "hibiki"
+file = "~/.config/bemenu.conf"
+start = "# start flavours"
+end = "# end flavours"
+
+[[items]]
+template = "neovim"
+subtemplate = "hibiki"
+file = "~/.config/nvim/lua/internal/colors.lua"
+rewrite = true
+
+[[items]]
+template = "mako"
+subtemplate = "hibiki"
+file = "~/.config/mako/config"
+start = "# start flavours"
+end = "# end flavours"
+hook = "makoctl reload"
+
+# TODO aerc
diff --git a/.config/flavours/templates/bemenu/templates/hibiki.mustache b/.config/flavours/templates/bemenu/templates/hibiki.mustache
new file mode 100644
index 0000000..7c1d8a1
--- /dev/null
+++ b/.config/flavours/templates/bemenu/templates/hibiki.mustache
@@ -0,0 +1,27 @@
+--fn \"DejaVu Sans Mono 10\"
+# normal
+--nb "#{{base00-hex}}"
+--nf "#{{base07-hex}}"
+# alternate
+--ab "#{{base00-hex}}" # "#{{base03-hex}}"
+--af "#{{base07-hex}}"
+# title
+--tb "#{{base06-hex}}"
+--tf "#{{base07-hex}}"
+# filter
+--fb "#{{base00-hex}}"
+--ff "#{{base07-hex}}"
+# selection
+--sb "#{{base0A-hex}}"
+--sf "#{{base00-hex}}"
+# highlighted
+--hb "#{{base06-hex}}"
+--hf "#{{base07-hex}}"
+# scrollbar
+--scb "#{{base00-hex}}"
+--scf "#{{base03-hex}}"
+# border
+--bdr "#{{base06-hex}}"
+# feedback
+--fbb "#{{base09-hex}}"
+--fbf "#{{base06-hex}}"
diff --git a/.config/flavours/templates/bemenu/templates/hibiki.mustache.in b/.config/flavours/templates/bemenu/templates/hibiki.mustache.in
new file mode 100644
index 0000000..8d0b077
--- /dev/null
+++ b/.config/flavours/templates/bemenu/templates/hibiki.mustache.in
@@ -0,0 +1,27 @@
+--fn \"@monofont@ 10\"
+# normal
+--nb "#{{base00-hex}}"
+--nf "#{{base07-hex}}"
+# alternate
+--ab "#{{base00-hex}}" # "#{{base03-hex}}"
+--af "#{{base07-hex}}"
+# title
+--tb "#{{base06-hex}}"
+--tf "#{{base07-hex}}"
+# filter
+--fb "#{{base00-hex}}"
+--ff "#{{base07-hex}}"
+# selection
+--sb "#{{base0A-hex}}"
+--sf "#{{base00-hex}}"
+# highlighted
+--hb "#{{base06-hex}}"
+--hf "#{{base07-hex}}"
+# scrollbar
+--scb "#{{base00-hex}}"
+--scf "#{{base03-hex}}"
+# border
+--bdr "#{{base06-hex}}"
+# feedback
+--fbb "#{{base09-hex}}"
+--fbf "#{{base06-hex}}"
diff --git a/.config/flavours/templates/foot/templates/hibiki.mustache b/.config/flavours/templates/foot/templates/hibiki.mustache
new file mode 100644
index 0000000..9dcff93
--- /dev/null
+++ b/.config/flavours/templates/foot/templates/hibiki.mustache
@@ -0,0 +1,28 @@
+# 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}}
+
+[colors]
+background={{base00-hex}}
+foreground={{base0F-hex}}
+
+# Normal colors
+regular0={{base00-hex}} # Black
+regular1={{base01-hex}} # Red
+regular2={{base02-hex}} # Green
+regular3={{base03-hex}} # Yellow
+regular4={{base04-hex}} # Blue
+regular5={{base05-hex}} # Magenta
+regular6={{base06-hex}} # Cyan
+regular7={{base07-hex}} # White
+
+# Bright colors
+bright0={{base08-hex}}
+bright1={{base09-hex}}
+bright2={{base0A-hex}}
+bright3={{base0B-hex}}
+bright4={{base0C-hex}}
+bright5={{base0D-hex}}
+bright6={{base0E-hex}}
+bright7={{base0F-hex}}
diff --git a/.config/flavours/templates/foot/templates/hibiki.mustache.in b/.config/flavours/templates/foot/templates/hibiki.mustache.in
new file mode 100644
index 0000000..05a87da
--- /dev/null
+++ b/.config/flavours/templates/foot/templates/hibiki.mustache.in
@@ -0,0 +1,28 @@
+# Base16 Karafuru Dark - foot color config
+# robertgzr
+
+font=@monofont@:size=11,Sarasa Fixed J:size=12,Noto Emoji,Material Design Icons Desktop # {{monofont}}
+
+[colors]
+background={{base00-hex}}
+foreground={{base0F-hex}}
+
+# Normal colors
+regular0={{base00-hex}} # Black
+regular1={{base01-hex}} # Red
+regular2={{base02-hex}} # Green
+regular3={{base03-hex}} # Yellow
+regular4={{base04-hex}} # Blue
+regular5={{base05-hex}} # Magenta
+regular6={{base06-hex}} # Cyan
+regular7={{base07-hex}} # White
+
+# Bright colors
+bright0={{base08-hex}}
+bright1={{base09-hex}}
+bright2={{base0A-hex}}
+bright3={{base0B-hex}}
+bright4={{base0C-hex}}
+bright5={{base0D-hex}}
+bright6={{base0E-hex}}
+bright7={{base0F-hex}}
diff --git a/.config/flavours/templates/mako/templates/hibiki.mustache b/.config/flavours/templates/mako/templates/hibiki.mustache
new file mode 100644
index 0000000..3b23d87
--- /dev/null
+++ b/.config/flavours/templates/mako/templates/hibiki.mustache
@@ -0,0 +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
diff --git a/.config/flavours/templates/mako/templates/hibiki.mustache.in b/.config/flavours/templates/mako/templates/hibiki.mustache.in
new file mode 100644
index 0000000..238e23e
--- /dev/null
+++ b/.config/flavours/templates/mako/templates/hibiki.mustache.in
@@ -0,0 +1,5 @@
+font=@uifont@ 10
+background-color=#{{base00-hex}}
+text-color=#{{base0F-hex}}
+border-color=#{{base06-hex}}dd
+progress-color=source #{{base06-hex}}dd
diff --git a/.config/flavours/templates/neovim/templates/hibiki.mustache b/.config/flavours/templates/neovim/templates/hibiki.mustache
new file mode 100644
index 0000000..42403d3
--- /dev/null
+++ b/.config/flavours/templates/neovim/templates/hibiki.mustache
@@ -0,0 +1,18 @@
+return {
+  base00 = '#{{base00-hex}}',
+  base01 = '#{{base01-hex}}',
+  base02 = '#{{base02-hex}}',
+  base03 = '#{{base03-hex}}',
+  base04 = '#{{base04-hex}}',
+  base05 = '#{{base05-hex}}',
+  base06 = '#{{base06-hex}}',
+  base07 = '#{{base07-hex}}',
+  base08 = '#{{base08-hex}}',
+  base09 = '#{{base09-hex}}',
+  base0A = '#{{base0A-hex}}',
+  base0B = '#{{base0B-hex}}',
+  base0C = '#{{base0C-hex}}',
+  base0D = '#{{base0D-hex}}',
+  base0E = '#{{base0E-hex}}',
+  base0F = '#{{base0F-hex}}',
+}
diff --git a/.config/flavours/templates/sway/templates/hibiki.mustache b/.config/flavours/templates/sway/templates/hibiki.mustache
index 4b14a4b..02291b3 100644
--- a/.config/flavours/templates/sway/templates/hibiki.mustache
+++ b/.config/flavours/templates/sway/templates/hibiki.mustache
@@ -1,18 +1,18 @@
+# vim: ft=swayconfig
 
-set $text              #{{base07-hex}}
-set $text2             #{{base05-hex}}
-set $bg                #{{base03-hex}}
+font pango:Iosevka Etoile 9
+
+set $text              #{{base0F-hex}}
+set $text2             #{{base07-hex}}
+set $bg                #{{base08-hex}}
 set $bg2               #{{base05-hex}}
 set $main              #{{base06-hex}}
 set $main2             #{{base0E-hex}}
 set $urgent            #{{base09-hex}}
-set $urgent2           #{{base08-hex}}
-set $indicator_focused #{{base0A-hex}}
-set $indicator_unfocused $bg
+set $urgent2           #{{base01-hex}}
+set $indicator         $text2
 
-client.focused           $main    $main   $text  $indicator_focused   $main
-#client.focused_inactive $bg      $bg     $text2 $indicator_unfocused $bg
-client.focused_inactive  $main2   $main2  $text2 $indicator_unfocused $main2
-client.unfocused         $bg      $bg     $text2 $indicator_unfocused $bg
-#client.unfocused        $main2   $main2  $text2 $indicator_unfocused $main2
-client.urgent            $urgent2 $urgent $text  $indicator_focused   $urgent
+client.focused           $main    $main   $text  $indicator $main
+client.focused_inactive  $bg      $bg     $text2 $bg        $bg
+client.unfocused         $bg      $bg     $text2 $bg        $bg
+client.urgent            $urgent2 $urgent $text  $urgent2   $urgent
diff --git a/.config/flavours/templates/sway/templates/hibiki.mustache.in b/.config/flavours/templates/sway/templates/hibiki.mustache.in
new file mode 100644
index 0000000..53c246b
--- /dev/null
+++ b/.config/flavours/templates/sway/templates/hibiki.mustache.in
@@ -0,0 +1,18 @@
+# vim: ft=swayconfig
+
+font pango:@uifont@ 9
+
+set $text              #{{base0F-hex}}
+set $text2             #{{base07-hex}}
+set $bg                #{{base08-hex}}
+set $bg2               #{{base05-hex}}
+set $main              #{{base06-hex}}
+set $main2             #{{base0E-hex}}
+set $urgent            #{{base09-hex}}
+set $urgent2           #{{base01-hex}}
+set $indicator         $text2
+
+client.focused           $main    $main   $text  $indicator $main
+client.focused_inactive  $bg      $bg     $text2 $bg        $bg
+client.unfocused         $bg      $bg     $text2 $bg        $bg
+client.urgent            $urgent2 $urgent $text  $urgent2   $urgent
diff --git a/.config/flavours/templates/vimiv/templates/hibiki.mustache b/.config/flavours/templates/vimiv/templates/hibiki.mustache
index 056f8fd..ba9bd20 100644
--- a/.config/flavours/templates/vimiv/templates/hibiki.mustache
+++ b/.config/flavours/templates/vimiv/templates/hibiki.mustache
@@ -1,3 +1,4 @@
+font = 10pt Iosevka Etoile
 base00 = #{{base00-hex}}
 base01 = #{{base01-hex}}
 base02 = #{{base02-hex}}
diff --git a/.config/flavours/templates/vimiv/templates/hibiki.mustache.in b/.config/flavours/templates/vimiv/templates/hibiki.mustache.in
new file mode 100644
index 0000000..2c09f4f
--- /dev/null
+++ b/.config/flavours/templates/vimiv/templates/hibiki.mustache.in
@@ -0,0 +1,17 @@
+font = 10pt @uifont@
+base00 = #{{base00-hex}}
+base01 = #{{base01-hex}}
+base02 = #{{base02-hex}}
+base03 = #{{base03-hex}}
+base04 = #{{base04-hex}}
+base05 = #{{base05-hex}}
+base06 = #{{base06-hex}}
+base07 = #{{base07-hex}}
+base08 = #{{base08-hex}}
+base09 = #{{base09-hex}}
+base0a = #{{base0A-hex}}
+base0b = #{{base0B-hex}}
+base0c = #{{base0C-hex}}
+base0d = #{{base0D-hex}}
+base0e = #{{base0E-hex}}
+base0f = #{{base0F-hex}}
diff --git a/.config/flavours/templates/waybar/templates/hibiki.mustache b/.config/flavours/templates/waybar/templates/hibiki.mustache
new file mode 100644
index 0000000..5ef11bb
--- /dev/null
+++ b/.config/flavours/templates/waybar/templates/hibiki.mustache
@@ -0,0 +1,21 @@
+@define-color base00 #{{base00-hex}};
+@define-color base01 #{{base01-hex}};
+@define-color base02 #{{base02-hex}};
+@define-color base03 #{{base03-hex}};
+@define-color base04 #{{base04-hex}};
+@define-color base05 #{{base05-hex}};
+@define-color base06 #{{base06-hex}};
+@define-color base07 #{{base07-hex}};
+@define-color base08 #{{base08-hex}};
+@define-color base09 #{{base09-hex}};
+@define-color base0A #{{base0A-hex}};
+@define-color base0B #{{base0B-hex}};
+@define-color base0C #{{base0C-hex}};
+@define-color base0D #{{base0D-hex}};
+@define-color base0E #{{base0E-hex}};
+@define-color base0F #{{base0F-hex}};
+
+* {
+    font-family: Iosevka Etoile, Sarasa Fixed J, Material Design Icons;
+    font-size: 9pt;
+}
diff --git a/.config/flavours/templates/waybar/templates/hibiki.mustache.in b/.config/flavours/templates/waybar/templates/hibiki.mustache.in
new file mode 100644
index 0000000..ddd8d07
--- /dev/null
+++ b/.config/flavours/templates/waybar/templates/hibiki.mustache.in
@@ -0,0 +1,21 @@
+@define-color base00 #{{base00-hex}};
+@define-color base01 #{{base01-hex}};
+@define-color base02 #{{base02-hex}};
+@define-color base03 #{{base03-hex}};
+@define-color base04 #{{base04-hex}};
+@define-color base05 #{{base05-hex}};
+@define-color base06 #{{base06-hex}};
+@define-color base07 #{{base07-hex}};
+@define-color base08 #{{base08-hex}};
+@define-color base09 #{{base09-hex}};
+@define-color base0A #{{base0A-hex}};
+@define-color base0B #{{base0B-hex}};
+@define-color base0C #{{base0C-hex}};
+@define-color base0D #{{base0D-hex}};
+@define-color base0E #{{base0E-hex}};
+@define-color base0F #{{base0F-hex}};
+
+* {
+    font-family: @uifont@, Sarasa Fixed J, Material Design Icons;
+    font-size: 9pt;
+}