alacritty: cleanup and restructure

Adds a README that explains how it works.
Introduces common extension prefixes to identify overlays and color sets
and makes the script output to stdout instead of to file

8 files changed, 41 insertions, 64 deletions

diff --git a/.config/alacritty/README.md b/.config/alacritty/README.md
new file mode 100644
index 0000000..b0cce63
--- /dev/null
+++ b/.config/alacritty/README.md
@@ -0,0 +1,18 @@
+# alacritty config
+
+* `*.ovl.yml` :: config overlays
+* `*.color.yml` :: color overlays
+
+use `ovl.sh` to generate the final config
+
+```
+# generate default config
+$ ovl.sh papercolor_dark.color.yml > alacritty.yml
+```
+
+```
+# generate scratch term config
+$ ovl.sh papercolor_dark.color.yml launcher.ovl.yml > launcher.yml
+```
+
+`base.ovl.yml` is always included.
diff --git a/.config/alacritty/overlay.yml b/.config/alacritty/base.ovl.yml
index 3c94561..3c94561 100644
--- a/.config/alacritty/overlay.yml
+++ b/.config/alacritty/base.ovl.yml
diff --git a/.config/alacritty/launcher.ovl.yml b/.config/alacritty/launcher.ovl.yml
new file mode 100644
index 0000000..91b84db
--- /dev/null
+++ b/.config/alacritty/launcher.ovl.yml
@@ -0,0 +1,20 @@
+env:
+  GUICALL: '1'
+
+window:
+  padding:
+    'x': 8
+    'y': 6
+  dynamic_padding: true
+  decorations: none
+
+font:
+  size: 13.0
+
+background_opacity: 0.95
+
+# shell:
+#   program: /usr/bin/env
+#   args:
+#     - LD_LIBRARY_PATH=/usr/local/lib64
+#     - mrsh
diff --git a/.config/alacritty/launcher.yml b/.config/alacritty/launcher.yml
deleted file mode 100644
index 877e2bd..0000000
--- a/.config/alacritty/launcher.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-env:
-  TERM: alacritty
-  GUICALL: '1'
-
-window:
-  padding:
-    x: 8
-    y: 8
-  dynamic_padding: true
-  decorations: none
-
-font:
-  normal:
-    family: Iosevka SS05
-    style: Slim
-  bold:
-    style: Bold
-  italic:
-    style: Italic
-  bold_italic:
-    style: Bold Italic
-  size: 13.0
-
-colors:
-  primary:
-    background: '#221e1d'
-    foreground: '#fffefe'
-    dim_foreground: '#BDC0BA'
-    bright_foreground: '#ffffff' # just white ;)
-  cursor:
-    text: '#221e1d'
-    cursor: '#fffefe'
-  normal:
-    black:   '#221e1d'
-    red:     '#b76868'
-    green:   '#bfbd90'
-    yellow:  '#ae9892'
-    blue:    '#b5c1c0'
-    magenta: '#76a3b0'
-    cyan:    '#4777aa'
-    white:   '#c7c6c6'
-  bright:
-    black:   '#3d3533'
-    red:     '#ff7474'
-    green:   '#ffffa5'
-    yellow:  '#f6b9a9'
-    blue:    '#d3ffff'
-    magenta: '#86def7'
-    cyan:    '#4c9aec'
-    white:   '#fffefe'
-
-background_opacity: 0.95
-# shell:
-#   program: /usr/bin/env
-#   args:
-#     - LD_LIBRARY_PATH=/usr/local/lib64
-#     - mrsh
-
-mouse:
-  url:
-    launcher:
-      program: url-launcher
diff --git a/.config/alacritty/ovl.sh b/.config/alacritty/ovl.sh
index 1a7504e..12296b0 100755
--- a/.config/alacritty/ovl.sh
+++ b/.config/alacritty/ovl.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
+# usage: ovl.sh COLORS ADDITIONAL_FILES...
 set -e
 
-colors_yml=$1
+colors_yml=$1 ; shift
 [ -z "$colors_yml" ] && exit 1
 
 set -x
-yq m -x overlay.yml "$colors_yml" > alacritty.yml
+yq m -x base.ovl.yml "$colors_yml" "$@"
diff --git a/.config/alacritty/papercolor_dark.yml b/.config/alacritty/papercolor_dark.color.yml
index 7fe2264..7fe2264 100644
--- a/.config/alacritty/papercolor_dark.yml
+++ b/.config/alacritty/papercolor_dark.color.yml
diff --git a/.config/alacritty/papercolor_light.yml b/.config/alacritty/papercolor_light.color.yml
index 45c76be..45c76be 100644
--- a/.config/alacritty/papercolor_light.yml
+++ b/.config/alacritty/papercolor_light.color.yml
diff --git a/.config/alacritty/base.yml b/.config/alacritty/upstream.yml
index d9054b0..d9054b0 100644
--- a/.config/alacritty/base.yml
+++ b/.config/alacritty/upstream.yml