diff --git a/README.md b/README.md index c179409..2bafc70 100644 --- a/README.md +++ b/README.md @@ -117,10 +117,10 @@ theme pipeline can be seen in detail below: ![Generation pipeline](images/theme_generation_pipeline.png) This figure demonstrates how `kitty` themes are generated, but the process is -generic to any palette, scheme, and app. This implemented in two stages using -the `monobiome` CLI: +generic to any palette, scheme, and app. This is implemented in two stages +using the `monobiome` CLI: -- First generate the scheme file, the definitions that respect perceptual +- First generate the scheme file, the lightness choices that achieve perceptual uniformity of accents with respect to the base monotone: ```sh @@ -137,11 +137,11 @@ the `monobiome` CLI: monobiome fill scheme.toml templates/kitty/active.theme -o kitty.theme ``` - This writes a concrete theme to `kitty.theme` that matches the user - preferences, i.e., the contrast (`-d`), background lightness (`-l`), mode - (`dark`), and biome (`grassland`). Every part of this process can be - customized: the scheme parameters, the scheme definitions/file, the app - template. + This writes a concrete `kitty` theme to `kitty.theme` that matches the user + preferences as captured in the previously generated scheme file, i.e., the + contrast (`-d`), background lightness (`-l`), mode (`dark`), and biome + (`grassland`). Every part of this process can be customized: the scheme + parameters, the scheme definitions/file, the app template. Running these commands in sequence from the repo root should work out-of-the-box after having installed the CLI tool. diff --git a/app-config/firefox/alpine-monobiome-dark.xpi b/app-config/firefox/alpine-monobiome-dark.xpi index 566d4a3..3ae234b 100644 Binary files a/app-config/firefox/alpine-monobiome-dark.xpi and b/app-config/firefox/alpine-monobiome-dark.xpi differ diff --git a/app-config/firefox/alpine-monobiome-light.xpi b/app-config/firefox/alpine-monobiome-light.xpi index f144dd5..0e3534b 100644 Binary files a/app-config/firefox/alpine-monobiome-light.xpi and b/app-config/firefox/alpine-monobiome-light.xpi differ diff --git a/app-config/firefox/alpine-monobiome.xpi b/app-config/firefox/alpine-monobiome.xpi index 8bc83ba..366706e 100644 Binary files a/app-config/firefox/alpine-monobiome.xpi and b/app-config/firefox/alpine-monobiome.xpi differ diff --git a/app-config/firefox/badlands-monobiome-dark.xpi b/app-config/firefox/badlands-monobiome-dark.xpi index 1d719f9..0e85c99 100644 Binary files a/app-config/firefox/badlands-monobiome-dark.xpi and b/app-config/firefox/badlands-monobiome-dark.xpi differ diff --git a/app-config/firefox/badlands-monobiome-light.xpi b/app-config/firefox/badlands-monobiome-light.xpi index 6220b6b..a42fd3a 100644 Binary files a/app-config/firefox/badlands-monobiome-light.xpi and b/app-config/firefox/badlands-monobiome-light.xpi differ diff --git a/app-config/firefox/badlands-monobiome.xpi b/app-config/firefox/badlands-monobiome.xpi index c80fac3..987562b 100644 Binary files a/app-config/firefox/badlands-monobiome.xpi and b/app-config/firefox/badlands-monobiome.xpi differ diff --git a/app-config/firefox/chaparral-monobiome-dark.xpi b/app-config/firefox/chaparral-monobiome-dark.xpi index 8882125..48e8186 100644 Binary files a/app-config/firefox/chaparral-monobiome-dark.xpi and b/app-config/firefox/chaparral-monobiome-dark.xpi differ diff --git a/app-config/firefox/chaparral-monobiome-light.xpi b/app-config/firefox/chaparral-monobiome-light.xpi index e0fddc5..b624d04 100644 Binary files a/app-config/firefox/chaparral-monobiome-light.xpi and b/app-config/firefox/chaparral-monobiome-light.xpi differ diff --git a/app-config/firefox/chaparral-monobiome.xpi b/app-config/firefox/chaparral-monobiome.xpi index bfac4de..320fb4c 100644 Binary files a/app-config/firefox/chaparral-monobiome.xpi and b/app-config/firefox/chaparral-monobiome.xpi differ diff --git a/app-config/firefox/grassland-monobiome-dark.xpi b/app-config/firefox/grassland-monobiome-dark.xpi index 9e0202f..4564922 100644 Binary files a/app-config/firefox/grassland-monobiome-dark.xpi and b/app-config/firefox/grassland-monobiome-dark.xpi differ diff --git a/app-config/firefox/grassland-monobiome-light.xpi b/app-config/firefox/grassland-monobiome-light.xpi index 7b5e5f6..ca1e7dc 100644 Binary files a/app-config/firefox/grassland-monobiome-light.xpi and b/app-config/firefox/grassland-monobiome-light.xpi differ diff --git a/app-config/firefox/grassland-monobiome.xpi b/app-config/firefox/grassland-monobiome.xpi index 3351417..14c4f03 100644 Binary files a/app-config/firefox/grassland-monobiome.xpi and b/app-config/firefox/grassland-monobiome.xpi differ diff --git a/app-config/firefox/heathland-monobiome-dark.xpi b/app-config/firefox/heathland-monobiome-dark.xpi index e99ea55..475f41b 100644 Binary files a/app-config/firefox/heathland-monobiome-dark.xpi and b/app-config/firefox/heathland-monobiome-dark.xpi differ diff --git a/app-config/firefox/heathland-monobiome-light.xpi b/app-config/firefox/heathland-monobiome-light.xpi index 930c7d4..5a01433 100644 Binary files a/app-config/firefox/heathland-monobiome-light.xpi and b/app-config/firefox/heathland-monobiome-light.xpi differ diff --git a/app-config/firefox/heathland-monobiome.xpi b/app-config/firefox/heathland-monobiome.xpi index 5e98850..18106f9 100644 Binary files a/app-config/firefox/heathland-monobiome.xpi and b/app-config/firefox/heathland-monobiome.xpi differ diff --git a/app-config/firefox/moorland-monobiome-dark.xpi b/app-config/firefox/moorland-monobiome-dark.xpi index 8378cef..351efdd 100644 Binary files a/app-config/firefox/moorland-monobiome-dark.xpi and b/app-config/firefox/moorland-monobiome-dark.xpi differ diff --git a/app-config/firefox/moorland-monobiome-light.xpi b/app-config/firefox/moorland-monobiome-light.xpi index ae1b5b2..96bebf4 100644 Binary files a/app-config/firefox/moorland-monobiome-light.xpi and b/app-config/firefox/moorland-monobiome-light.xpi differ diff --git a/app-config/firefox/moorland-monobiome.xpi b/app-config/firefox/moorland-monobiome.xpi index d2ae7db..d16f151 100644 Binary files a/app-config/firefox/moorland-monobiome.xpi and b/app-config/firefox/moorland-monobiome.xpi differ diff --git a/app-config/firefox/reef-monobiome-dark.xpi b/app-config/firefox/reef-monobiome-dark.xpi index 8c1a44c..164959a 100644 Binary files a/app-config/firefox/reef-monobiome-dark.xpi and b/app-config/firefox/reef-monobiome-dark.xpi differ diff --git a/app-config/firefox/reef-monobiome-light.xpi b/app-config/firefox/reef-monobiome-light.xpi index e629e02..098ec05 100644 Binary files a/app-config/firefox/reef-monobiome-light.xpi and b/app-config/firefox/reef-monobiome-light.xpi differ diff --git a/app-config/firefox/reef-monobiome.xpi b/app-config/firefox/reef-monobiome.xpi index a73d1a9..ac9205f 100644 Binary files a/app-config/firefox/reef-monobiome.xpi and b/app-config/firefox/reef-monobiome.xpi differ diff --git a/app-config/firefox/savanna-monobiome-dark.xpi b/app-config/firefox/savanna-monobiome-dark.xpi index cc3e307..aa36afe 100644 Binary files a/app-config/firefox/savanna-monobiome-dark.xpi and b/app-config/firefox/savanna-monobiome-dark.xpi differ diff --git a/app-config/firefox/savanna-monobiome-light.xpi b/app-config/firefox/savanna-monobiome-light.xpi index e483960..6541cb6 100644 Binary files a/app-config/firefox/savanna-monobiome-light.xpi and b/app-config/firefox/savanna-monobiome-light.xpi differ diff --git a/app-config/firefox/savanna-monobiome.xpi b/app-config/firefox/savanna-monobiome.xpi index 1ae7b8b..9930dfd 100644 Binary files a/app-config/firefox/savanna-monobiome.xpi and b/app-config/firefox/savanna-monobiome.xpi differ diff --git a/app-config/firefox/tundra-monobiome-dark.xpi b/app-config/firefox/tundra-monobiome-dark.xpi index 9456a9b..0cc19c2 100644 Binary files a/app-config/firefox/tundra-monobiome-dark.xpi and b/app-config/firefox/tundra-monobiome-dark.xpi differ diff --git a/app-config/firefox/tundra-monobiome-light.xpi b/app-config/firefox/tundra-monobiome-light.xpi index 03d489b..b284e72 100644 Binary files a/app-config/firefox/tundra-monobiome-light.xpi and b/app-config/firefox/tundra-monobiome-light.xpi differ diff --git a/app-config/firefox/tundra-monobiome.xpi b/app-config/firefox/tundra-monobiome.xpi index ea76f12..c8ac5f5 100644 Binary files a/app-config/firefox/tundra-monobiome.xpi and b/app-config/firefox/tundra-monobiome.xpi differ diff --git a/colors/hex-palette.toml b/colors/hex-palette.toml index 908cf36..bb24c9e 100644 --- a/colors/hex-palette.toml +++ b/colors/hex-palette.toml @@ -1,4 +1,4 @@ -version = "1.5.0" +version = "1.5.1" [alpine] l10 = "#030303" @@ -271,7 +271,7 @@ l94 = "#f1eae4" l95 = "#f4ede7" l96 = "#f7f0ea" l97 = "#fbf4ee" -l98 = "#fef7f1" +l98 = "#fdf7f2" [savanna] l10 = "#040301" @@ -362,7 +362,7 @@ l94 = "#ecece3" l95 = "#efefe7" l96 = "#f3f2ea" l97 = "#f6f6ed" -l98 = "#f9f9f1" +l98 = "#f9f9f2" [grassland] l10 = "#020402" @@ -453,7 +453,7 @@ l94 = "#e6ede7" l95 = "#eaf1ea" l96 = "#edf4ee" l97 = "#f0f7f1" -l98 = "#f4fbf4" +l98 = "#f4faf5" [reef] l10 = "#010404" @@ -544,7 +544,7 @@ l94 = "#e3edef" l95 = "#e7f1f2" l96 = "#eaf4f5" l97 = "#edf7f9" -l98 = "#f0fbfc" +l98 = "#f2fafb" [tundra] l10 = "#020306" @@ -726,7 +726,7 @@ l94 = "#ede9f1" l95 = "#f0edf4" l96 = "#f3f0f8" l97 = "#f7f3fb" -l98 = "#faf7ff" +l98 = "#faf7fe" [moorland] l10 = "#050204" @@ -817,7 +817,7 @@ l94 = "#f1e8ec" l95 = "#f5ecef" l96 = "#f8eff3" l97 = "#fbf2f6" -l98 = "#fff6f9" +l98 = "#fef6f9" [red] l10 = "#0d0000" @@ -1443,18 +1443,18 @@ l83 = "#d6b8f7" l84 = "#d8bcf8" l85 = "#dbc1f9" l86 = "#ddc5f9" -l87 = "#e0c9fa" -l88 = "#e2cdfb" -l89 = "#e5d1fb" -l90 = "#e7d5fc" -l91 = "#e9d9fc" -l92 = "#ecdefd" -l93 = "#eee2fd" -l94 = "#f1e6fe" -l95 = "#f3eafe" -l96 = "#f5eefe" -l97 = "#f8f2fe" -l98 = "#faf7ff" +l87 = "#dfc9f9" +l88 = "#e2cdfa" +l89 = "#e4d2fa" +l90 = "#e6d6fa" +l91 = "#e9dafb" +l92 = "#ebdefb" +l93 = "#eee2fb" +l94 = "#f0e6fc" +l95 = "#f2ebfc" +l96 = "#f5effd" +l97 = "#f7f3fd" +l98 = "#faf7fe" [magenta] l10 = "#080104" @@ -1540,9 +1540,9 @@ l89 = "#f7cde0" l90 = "#f8d2e2" l91 = "#f9d6e5" l92 = "#fadbe8" -l93 = "#fbdfeb" -l94 = "#fce4ee" +l93 = "#fadfeb" +l94 = "#fbe4ee" l95 = "#fce8f1" -l96 = "#fdedf4" -l97 = "#fef1f6" +l96 = "#fdedf3" +l97 = "#fdf1f6" l98 = "#fef6f9" diff --git a/colors/oklch-palette.toml b/colors/oklch-palette.toml index 5ba71a1..a36fd57 100644 --- a/colors/oklch-palette.toml +++ b/colors/oklch-palette.toml @@ -1,4 +1,4 @@ -version = "1.5.0" +version = "1.5.1" [alpine] l10 = "oklch(10.0% 0.0000 0.0)" @@ -180,7 +180,7 @@ l94 = "oklch(94.0% 0.0110 29.0)" l95 = "oklch(95.0% 0.0110 29.0)" l96 = "oklch(96.0% 0.0110 29.0)" l97 = "oklch(97.0% 0.0110 29.0)" -l98 = "oklch(98.0% 0.0097 29.0)" +l98 = "oklch(98.0% 0.0092 29.0)" [chaparral] l10 = "oklch(10.0% 0.0110 62.5)" @@ -271,7 +271,7 @@ l94 = "oklch(94.0% 0.0110 62.5)" l95 = "oklch(95.0% 0.0110 62.5)" l96 = "oklch(96.0% 0.0110 62.5)" l97 = "oklch(97.0% 0.0110 62.5)" -l98 = "oklch(98.0% 0.0110 62.5)" +l98 = "oklch(98.0% 0.0092 62.5)" [savanna] l10 = "oklch(10.0% 0.0110 104.0)" @@ -362,7 +362,7 @@ l94 = "oklch(94.0% 0.0110 104.0)" l95 = "oklch(95.0% 0.0110 104.0)" l96 = "oklch(96.0% 0.0110 104.0)" l97 = "oklch(97.0% 0.0110 104.0)" -l98 = "oklch(98.0% 0.0110 104.0)" +l98 = "oklch(98.0% 0.0092 104.0)" [grassland] l10 = "oklch(10.0% 0.0110 148.0)" @@ -453,7 +453,7 @@ l94 = "oklch(94.0% 0.0110 148.0)" l95 = "oklch(95.0% 0.0110 148.0)" l96 = "oklch(96.0% 0.0110 148.0)" l97 = "oklch(97.0% 0.0110 148.0)" -l98 = "oklch(98.0% 0.0110 148.0)" +l98 = "oklch(98.0% 0.0092 148.0)" [reef] l10 = "oklch(10.0% 0.0110 205.0)" @@ -544,7 +544,7 @@ l94 = "oklch(94.0% 0.0110 205.0)" l95 = "oklch(95.0% 0.0110 205.0)" l96 = "oklch(96.0% 0.0110 205.0)" l97 = "oklch(97.0% 0.0110 205.0)" -l98 = "oklch(98.0% 0.0110 205.0)" +l98 = "oklch(98.0% 0.0092 205.0)" [tundra] l10 = "oklch(10.0% 0.0110 262.0)" @@ -635,7 +635,7 @@ l94 = "oklch(94.0% 0.0110 262.0)" l95 = "oklch(95.0% 0.0110 262.0)" l96 = "oklch(96.0% 0.0110 262.0)" l97 = "oklch(97.0% 0.0110 262.0)" -l98 = "oklch(98.0% 0.0094 262.0)" +l98 = "oklch(98.0% 0.0092 262.0)" [heathland] l10 = "oklch(10.0% 0.0110 306.0)" @@ -726,7 +726,7 @@ l94 = "oklch(94.0% 0.0110 306.0)" l95 = "oklch(95.0% 0.0110 306.0)" l96 = "oklch(96.0% 0.0110 306.0)" l97 = "oklch(97.0% 0.0110 306.0)" -l98 = "oklch(98.0% 0.0110 306.0)" +l98 = "oklch(98.0% 0.0092 306.0)" [moorland] l10 = "oklch(10.0% 0.0110 350.0)" @@ -817,7 +817,7 @@ l94 = "oklch(94.0% 0.0110 350.0)" l95 = "oklch(95.0% 0.0110 350.0)" l96 = "oklch(96.0% 0.0110 350.0)" l97 = "oklch(97.0% 0.0110 350.0)" -l98 = "oklch(98.0% 0.0110 350.0)" +l98 = "oklch(98.0% 0.0092 350.0)" [red] l10 = "oklch(10.0% 0.0406 29.0)" @@ -1087,10 +1087,10 @@ l91 = "oklch(91.0% 0.0402 104.0)" l92 = "oklch(92.0% 0.0360 104.0)" l93 = "oklch(93.0% 0.0317 104.0)" l94 = "oklch(94.0% 0.0273 104.0)" -l95 = "oklch(95.0% 0.0229 104.0)" -l96 = "oklch(96.0% 0.0184 104.0)" +l95 = "oklch(95.0% 0.0228 104.0)" +l96 = "oklch(96.0% 0.0183 104.0)" l97 = "oklch(97.0% 0.0138 104.0)" -l98 = "oklch(98.0% 0.0093 104.0)" +l98 = "oklch(98.0% 0.0092 104.0)" [green] l10 = "oklch(10.0% 0.0178 148.0)" @@ -1442,19 +1442,19 @@ l82 = "oklch(82.0% 0.0964 306.0)" l83 = "oklch(83.0% 0.0915 306.0)" l84 = "oklch(84.0% 0.0865 306.0)" l85 = "oklch(85.0% 0.0815 306.0)" -l86 = "oklch(86.0% 0.0764 306.0)" -l87 = "oklch(87.0% 0.0712 306.0)" -l88 = "oklch(88.0% 0.0660 306.0)" -l89 = "oklch(89.0% 0.0607 306.0)" -l90 = "oklch(90.0% 0.0554 306.0)" -l91 = "oklch(91.0% 0.0500 306.0)" -l92 = "oklch(92.0% 0.0446 306.0)" -l93 = "oklch(93.0% 0.0391 306.0)" -l94 = "oklch(94.0% 0.0336 306.0)" -l95 = "oklch(95.0% 0.0281 306.0)" -l96 = "oklch(96.0% 0.0225 306.0)" -l97 = "oklch(97.0% 0.0169 306.0)" -l98 = "oklch(98.0% 0.0113 306.0)" +l86 = "oklch(86.0% 0.0758 306.0)" +l87 = "oklch(87.0% 0.0697 306.0)" +l88 = "oklch(88.0% 0.0638 306.0)" +l89 = "oklch(89.0% 0.0579 306.0)" +l90 = "oklch(90.0% 0.0522 306.0)" +l91 = "oklch(91.0% 0.0466 306.0)" +l92 = "oklch(92.0% 0.0410 306.0)" +l93 = "oklch(93.0% 0.0356 306.0)" +l94 = "oklch(94.0% 0.0302 306.0)" +l95 = "oklch(95.0% 0.0250 306.0)" +l96 = "oklch(96.0% 0.0198 306.0)" +l97 = "oklch(97.0% 0.0147 306.0)" +l98 = "oklch(98.0% 0.0097 306.0)" [magenta] l10 = "oklch(10.0% 0.0242 350.0)" @@ -1538,11 +1538,11 @@ l87 = "oklch(87.0% 0.0619 350.0)" l88 = "oklch(88.0% 0.0574 350.0)" l89 = "oklch(89.0% 0.0528 350.0)" l90 = "oklch(90.0% 0.0481 350.0)" -l91 = "oklch(91.0% 0.0435 350.0)" -l92 = "oklch(92.0% 0.0387 350.0)" -l93 = "oklch(93.0% 0.0340 350.0)" -l94 = "oklch(94.0% 0.0292 350.0)" -l95 = "oklch(95.0% 0.0244 350.0)" -l96 = "oklch(96.0% 0.0196 350.0)" -l97 = "oklch(97.0% 0.0147 350.0)" -l98 = "oklch(98.0% 0.0098 350.0)" +l91 = "oklch(91.0% 0.0433 350.0)" +l92 = "oklch(92.0% 0.0384 350.0)" +l93 = "oklch(93.0% 0.0334 350.0)" +l94 = "oklch(94.0% 0.0285 350.0)" +l95 = "oklch(95.0% 0.0237 350.0)" +l96 = "oklch(96.0% 0.0189 350.0)" +l97 = "oklch(97.0% 0.0141 350.0)" +l98 = "oklch(98.0% 0.0094 350.0)" diff --git a/scheme.toml b/scheme.toml deleted file mode 100644 index d21ed78..0000000 --- a/scheme.toml +++ /dev/null @@ -1,82 +0,0 @@ -# ++ monobiome scheme file ++ -# ++ generated CLI @ 1.5.0 ++ -version = "1.5.0" -mode = "dark" -biome = "moorland" -metric = "oklch" -distance = "0.42" -l_base = "20" -l_step = "5" -fg_gap = "50" -grey_gap = "30" -term_fg_gap = "65" -bg0 = "f{{moorland.l20}}" -bg1 = "f{{moorland.l25}}" -bg2 = "f{{moorland.l30}}" -bg3 = "f{{moorland.l35}}" -fg3 = "f{{moorland.l70}}" -fg2 = "f{{moorland.l75}}" -fg1 = "f{{moorland.l80}}" -fg0 = "f{{moorland.l85}}" -black = "f{{moorland.l20}}" -grey = "f{{moorland.l50}}" -white = "f{{moorland.l75}}" -red = "f{{red.l59}}" -orange = "f{{orange.l61}}" -yellow = "f{{yellow.l62}}" -green = "f{{green.l61}}" -cyan = "f{{cyan.l61}}" -blue = "f{{blue.l60}}" -violet = "f{{violet.l60}}" -magenta = "f{{orange.l61}}" - -[term] -background = "f{{moorland.l25}}" -selection_bg = "f{{moorland.l30}}" -selection_fg = "f{{moorland.l85}}" -foreground = "f{{moorland.l90}}" -cursor = "f{{moorland.l85}}" -cursor_text = "f{{moorland.l30}}" - -[term.normal] -black = "f{{moorland.l25}}" -grey = "f{{moorland.l55}}" -white = "f{{moorland.l80}}" -red = "f{{red.l64}}" -yellow = "f{{yellow.l67}}" -green = "f{{green.l66}}" -cyan = "f{{blue.l65}}" -blue = "f{{blue.l65}}" -magenta = "f{{orange.l66}}" - -[term.bright] -black = "f{{moorland.l35}}" -grey = "f{{moorland.l65}}" -white = "f{{moorland.l90}}" -red = "f{{red.l75}}" -yellow = "f{{yellow.l77}}" -green = "f{{green.l76}}" -cyan = "f{{blue.l76}}" -blue = "f{{blue.l76}}" -magenta = "f{{orange.l76}}" - -[vim] -bg0 = "f{{moorland.l25}}" -bg1 = "f{{moorland.l30}}" -bg2 = "f{{moorland.l35}}" -bg3 = "f{{moorland.l40}}" -fg3 = "f{{moorland.l75}}" -fg2 = "f{{moorland.l80}}" -fg1 = "f{{moorland.l85}}" -fg0 = "f{{moorland.l90}}" -black = "f{{moorland.l25}}" -grey = "f{{moorland.l55}}" -white = "f{{moorland.l80}}" -red = "f{{red.l64}}" -orange = "f{{orange.l66}}" -yellow = "f{{yellow.l67}}" -green = "f{{green.l66}}" -cyan = "f{{green.l66}}" -blue = "f{{blue.l65}}" -violet = "f{{blue.l65}}" -magenta = "f{{red.l64}}" \ No newline at end of file diff --git a/scripts/generate.sh b/scripts/generate.sh index 655caa4..102960b 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# note: this script is not portable; to be run in the monobiome scripts/ -# directory (notice the `rm` invocations) +# note: this script is not portable; script to be placed in the monobiome +# scripts/ directory and run from the repo root (notice the `rm` invocations) # clean existing config rm -rf app-config/* @@ -37,6 +37,9 @@ for biome in "${biomes[@]}"; do done done +# remove lingering scheme file +rm scheme.toml + cd app-config/firefox shopt -s nullglob for f in *; do