diff --git a/.toml b/.toml new file mode 100644 index 0000000..e69de29 diff --git a/README.md b/README.md index 8c3222d..0fc2de8 100644 --- a/README.md +++ b/README.md @@ -94,9 +94,16 @@ modified from KDE Breeze by robocopAlpha ![image-20200730153019490](assets/dracula.png) -### Github Light | [toml](themes/githubLight.toml) +### [Flexoki Dark](https://github.com/kepano/flexoki/blob/main/alacritty/flexoki-dark.yaml) | [toml](themes/flexoki-dark.toml) + +![image-20200730153019490](assets/flexoki-dark.png) + +### Github Light 1 | [toml](themes/githubLight.toml) ![githubLight](assets/githubLight.png) +### [Github Light 2](https://github.com/projekt0n/github-theme-contrib/blob/main/themes/alacritty/github_light.yml) | [toml](themes/github_light2.toml) +![githubLight](assets/github_light2.png) + ### Gruvbox | [toml](themes/gruvbox.toml) ![image-20200730153019490](assets/gruvbox.png) @@ -146,10 +153,19 @@ Gray and white are changed from the base theme ![image-20200730155432908](assets/pop_OS.png) +### [Remedy-Dark](https://github.com/alacritty/alacritty-theme/blob/master/themes/remedy_dark.toml) | [toml](themes/remedy_dark.toml) + +![image-20200730160014996](assets/remedy_dark.png) + + ### robocopAlpha Colors | [toml](themes/robocopAlpha.toml) ![image-20200730160014996](assets/robocopAlpha.png) +### [Rose Pine Dawn]() | [toml](themes/rose-pine-dawn.toml) + +![image-20200730155432908](assets/rose-pine-dawn.png) + ### [Seabird](https://github.com/nightsense/seabird) | [toml](themes/seabird.toml) Foreground color has been made darker `#1A1A1A` than original to improve contrast diff --git a/assets/flexoki-dark.png b/assets/flexoki-dark.png new file mode 100644 index 0000000..e56466d Binary files /dev/null and b/assets/flexoki-dark.png differ diff --git a/assets/githubLight.png b/assets/githubLight.png index 6c83c83..091ed27 100644 Binary files a/assets/githubLight.png and b/assets/githubLight.png differ diff --git a/assets/github_light2.png b/assets/github_light2.png new file mode 100644 index 0000000..48cf5be Binary files /dev/null and b/assets/github_light2.png differ diff --git a/assets/paperColorLight.png b/assets/paperColorLight.png index 86415aa..e8607e9 100644 Binary files a/assets/paperColorLight.png and b/assets/paperColorLight.png differ diff --git a/assets/pencilLight.png b/assets/pencilLight.png index dda1005..d95d998 100644 Binary files a/assets/pencilLight.png and b/assets/pencilLight.png differ diff --git a/assets/remedy_dark.png b/assets/remedy_dark.png new file mode 100644 index 0000000..f328df5 Binary files /dev/null and b/assets/remedy_dark.png differ diff --git a/assets/rose-pine-dawn.png b/assets/rose-pine-dawn.png new file mode 100644 index 0000000..99b0d1b Binary files /dev/null and b/assets/rose-pine-dawn.png differ diff --git a/convert_to_toml.sh b/convert_to_toml.sh index 620a59e..9161a8c 100755 --- a/convert_to_toml.sh +++ b/convert_to_toml.sh @@ -15,22 +15,74 @@ # # Get yj from: https://github.com/sclevine/yj # shopt -s globstar -cd themes -if command -v sd > /dev/null 2>&1; then - if command -v yj > /dev/null 2>&1; then - # For each .yaml file in the current directory - for yaml_file in *.yml; do +HELP() +{ +printf 'This script allows you to covnert YAML formatted themes to TOML while changing some keywords +to ensure compatibility with contemporary release of alacritty. + +Usage: + bash convert_to_toml.sh [options] + +OPTIONS: + --help Show help + --dir Batch convert all files stored in themes/ + --file FILE.yaml Convert input file +'; +} + + +convertDir(){ + cd themes + if command -v sd > /dev/null 2>&1; then + if command -v yj > /dev/null 2>&1; then + if /bin/ls | grep -Ei "yml$" &> /dev/null ; then + # For each .yaml file in the current directory + for yaml_file in *.yml; do + # Use basename to get the file name without the .yaml extension + base_name=$(basename "$yaml_file" .yml) + + # Convert .yaml to .toml using yj + cat "$yaml_file" | yj -yt | sd "^.*_background.*\r?\n" "" | sd "^.*_foreground.*\r?\n" "" > "${base_name}.toml" + done + else + echo "No YAML files found in ./themes/" + fi + else + echo "Get yj from: https://github.com/sclevine/yj" + fi + else + echo "Get sd from: https://github.com/chmln/sd" + fi +} + +convertFile(){ + # checking for dependencies + if command -v sd > /dev/null 2>&1; then + if command -v yj > /dev/null 2>&1; then + yaml_file=${1} # Use basename to get the file name without the .yaml extension base_name=$(basename "$yaml_file" .yml) - # Convert .yaml to .toml using yj - cat "$yaml_file" | yj -yt | sd "^.*_background.*\r?\n" "" | sd "^.*_foreground.*\r?\n" "" > "${base_name}.toml" - done + cat "${yaml_file}" | yj -yt | sd "^.*_background.*\r?\n" "" | sd "^.*_foreground.*\r?\n" "" > "${base_name}.toml" + else + echo "Get yj from: https://github.com/sclevine/yj" + fi else - echo "Get yj from: https://github.com/sclevine/yj" + echo "Get sd from: https://github.com/chmln/sd" fi +} + + +if [ "$1" == "--help" ]; then + HELP + exit 0; +elif [ "$1" == "--dir" ]; then + convertDir + exit 0; +elif [ "$1" == "--file" ]; then + convertFile $2 + exit 0; else - echo "Get sd from: https://github.com/chmln/sd" -fi - - + HELP + exit 0; +fi \ No newline at end of file diff --git a/themes/flexoki-dark.toml b/themes/flexoki-dark.toml new file mode 100644 index 0000000..65779ae --- /dev/null +++ b/themes/flexoki-dark.toml @@ -0,0 +1,35 @@ +# From: https://github.com/kepano/flexoki/blob/main/alacritty/flexoki-dark.yaml +[colors] +[colors.primary] +background = "0x282726" +foreground = "0xFFFCF0" +[colors.cursor] +text = "0xFFFCF0" +cursor = "0xFFFCF0" +[colors.normal] +black = "0x100F0F" +red = "0xAF3029" +green = "0x66800B" +yellow = "0xAD8301" +blue = "0x205EA6" +magenta = "0xA02F6F" +cyan = "0x24837B" +white = "0xFFFCF0" +[colors.bright] +black = "0x100F0F" +red = "0xD14D41" +green = "0x879A39" +yellow = "0xD0A215" +blue = "0x4385BE" +magenta = "0xCE5D97" +cyan = "0x3AA99F" +white = "0xFFFCF0" +[colors.dim] +black = "0x100F0F" +red = "0xAF3029" +green = "0x66800B" +yellow = "0xAD8301" +blue = "0x205EA6" +magenta = "0xA02F6F" +cyan = "0x24837B" +white = "0xFFFCF0" diff --git a/themes/github_light2.toml b/themes/github_light2.toml new file mode 100644 index 0000000..0445e83 --- /dev/null +++ b/themes/github_light2.toml @@ -0,0 +1,26 @@ +# From: https://github.com/projekt0n/github-theme-contrib/raw/main/themes/alacritty/github_light.yml +[colors] +[colors.primary] +background = "0xffffff" +foreground = "0x1F2328" +[colors.cursor] +text = "0xffffff" +cursor = "0x1f2328" +[colors.normal] +black = "0x24292f" +red = "0xcf222e" +green = "0x116329" +yellow = "0x4d2d00" +blue = "0x0969da" +magenta = "0x8250df" +cyan = "0x1b7c83" +white = "0x6e7781" +[colors.bright] +black = "0x57606a" +red = "0xa40e26" +green = "0x1a7f37" +yellow = "0x633c01" +blue = "0x218bff" +magenta = "0x8250df" +cyan = "0x1b7c83" +white = "0x6e7781" diff --git a/themes/remedy_dark.toml b/themes/remedy_dark.toml new file mode 100644 index 0000000..d6c806d --- /dev/null +++ b/themes/remedy_dark.toml @@ -0,0 +1,30 @@ +# From: https://github.com/alacritty/alacritty-theme/blob/master/themes/remedy_dark.toml +# Default colors +[colors.primary] +background = '#2c2b2a' +foreground = '#f9e7c4' + +dim_foreground = '#685E4A' +bright_foreground = '#1C1508' + +# Normal colors +[colors.normal] +black = '#282a2e' +red = '#a54242' +green = '#8c9440' +yellow = '#de935f' +blue = '#5f819d' +magenta = '#85678f' +cyan = '#5e8d87' +white = '#707880' + +# Bright colors +[colors.bright] +black = '#373b41' +red = '#cc6666' +green = '#b5bd68' +yellow = '#f0c674' +blue = '#81a2be' +magenta = '#b294bb' +cyan = '#8abeb7' +white = '#c5c8c6' diff --git a/themes/rose-pine-dawn.toml b/themes/rose-pine-dawn.toml new file mode 100644 index 0000000..fe04926 --- /dev/null +++ b/themes/rose-pine-dawn.toml @@ -0,0 +1,76 @@ +# From: https://github.com/rose-pine/alacritty/raw/main/dist/rose-pine-dawn.toml +# Colors section of "Alacritty - TOML configuration file format" +# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd#colors + +[colors.primary] +foreground = "#575279" +background = "#faf4ed" +dim_foreground = "#797593" +bright_foreground = "#575279" + +[colors.cursor] +text = "#575279" +cursor = "#cecacd" + +[colors.vi_mode_cursor] +text = "#575279" +cursor = "#cecacd" + +[colors.search.matches] +foreground = "#797593" +background = "#f2e9e1" + +[colors.search.focused_match] +foreground = "#faf4ed" +background = "#d7827e" + +[colors.hints.start] +foreground = "#797593" +background = "#fffaf3" + +[colors.hints.end] +foreground = "#9893a5" +background = "#fffaf3" + +[colors.line_indicator] +foreground = "None" +background = "None" + +[colors.footer_bar] +foreground = "#575279" +background = "#fffaf3" + +[colors.selection] +text = "#575279" +background = "#dfdad9" + +[colors.normal] +black = "#f2e9e1" +red = "#b4637a" +green = "#286983" +yellow = "#ea9d34" +blue = "#56949f" +magenta = "#907aa9" +cyan = "#d7827e" +white = "#575279" + +[colors.bright] +black = "#9893a5" +red = "#b4637a" +green = "#286983" +yellow = "#ea9d34" +blue = "#56949f" +magenta = "#907aa9" +cyan = "#d7827e" +white = "#575279" + +[colors.dim] +black = "#9893a5" +red = "#b4637a" +green = "#286983" +yellow = "#ea9d34" +blue = "#56949f" +magenta = "#907aa9" +cyan = "#d7827e" +white = "#575279" +