From 27d669974ec8ffd22dfb060b5b0d7eaad691f832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <es.ensar@gmail.com>
Date: Tue, 12 Jan 2021 23:18:09 +0100
Subject: [PATCH] Add alacritty config with separate colors file

---
 symlinks/config/alacritty/alacritty.yml     | 78 +--------------------
 symlinks/config/alacritty/color_schemes.yml | 49 -------------
 symlinks/config/alacritty/colors.yml        | 24 +++++++
 symlinks/config/alacritty/font.yml          | 18 +++++
 themes/gruvbox-dark/alacritty_colors.yml    | 24 +++++++
 themes/gruvbox-light/alacritty_colors.yml   | 24 +++++++
 themes/select-theme                         |  6 +-
 7 files changed, 98 insertions(+), 125 deletions(-)
 delete mode 100644 symlinks/config/alacritty/color_schemes.yml
 create mode 100644 symlinks/config/alacritty/colors.yml
 create mode 100644 symlinks/config/alacritty/font.yml
 create mode 100644 themes/gruvbox-dark/alacritty_colors.yml
 create mode 100644 themes/gruvbox-light/alacritty_colors.yml

diff --git a/symlinks/config/alacritty/alacritty.yml b/symlinks/config/alacritty/alacritty.yml
index fd6b9b6..ad72c17 100644
--- a/symlinks/config/alacritty/alacritty.yml
+++ b/symlinks/config/alacritty/alacritty.yml
@@ -1,77 +1,5 @@
-font:
-  normal:
-    family: SauceCodePro Nerd Font Mono
-    style: Regular
-
-  bold:
-    family: SauceCodePro Nerd Font Mono
-    style: Bold
-
-  italic:
-    family: SauceCodePro Nerd Font Mono
-    style: Italic
-
-  bold_italic:
-    family: SauceCodePro Nerd Font Mono
-    style: Bold Italic
-
-  size: 12.0
-
-schemes:
-  gruvbox_dark: &gruvbox_dark
-    primary:
-      background: '#282828'
-      foreground: '#ebdbb2'
-
-    normal:
-      black:   '#282828'
-      red:     '#cc241d'
-      green:   '#98971a'
-      yellow:  '#d79921'
-      blue:    '#458588'
-      magenta: '#b16286'
-      cyan:    '#689d6a'
-      white:   '#a89984'
-
-    bright:
-      black:   '#928374'
-      red:     '#fb4934'
-      green:   '#b8bb26'
-      yellow:  '#fabd2f'
-      blue:    '#83a598'
-      magenta: '#d3869b'
-      cyan:    '#8ec07c'
-      white:   '#ebdbb2'
-  gruvbox_dark: &gruvbox_light
-    primary:
-      background: '#fbf1c7'
-      foreground: '#3c3836'
-
-    normal:
-      black:   '#fbf1c7'
-      red:     '#cc241d'
-      green:   '#98971a'
-      yellow:  '#d79921'
-      blue:    '#458588'
-      magenta: '#b16286'
-      cyan:    '#689d6a'
-      white:   '#7c6f64'
-
-    bright:
-      black:   '#928374'
-      red:     '#9d0006'
-      green:   '#79740e'
-      yellow:  '#b57614'
-      blue:    '#076678'
-      magenta: '#8f3f71'
-      cyan:    '#427b58'
-      white:   '#3c3836'
-
-colors: *gruvbox_dark
-
 alt_send_esc: true
 
-# Wait for a new update which includes support for ~ (https://github.com/alacritty/alacritty/commit/07cfe8bbba0851ff4989f6aaf082d72130cd0f5b)
-# import:
-#   - ~/.config/alacritty/color_schemes.yml
-#   - ~/.config/alacritty/theme.yml
+import:
+  - ~/.config/alacritty/font.yml
+  - ~/.config/alacritty/colors.yml
diff --git a/symlinks/config/alacritty/color_schemes.yml b/symlinks/config/alacritty/color_schemes.yml
deleted file mode 100644
index 1798a53..0000000
--- a/symlinks/config/alacritty/color_schemes.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-schemes:
-  gruvbox_dark: &gruvbox_dark
-    primary:
-      background: '#282828'
-      foreground: '#ebdbb2'
-
-    normal:
-      black:   '#282828'
-      red:     '#cc241d'
-      green:   '#98971a'
-      yellow:  '#d79921'
-      blue:    '#458588'
-      magenta: '#b16286'
-      cyan:    '#689d6a'
-      white:   '#a89984'
-
-    bright:
-      black:   '#928374'
-      red:     '#fb4934'
-      green:   '#b8bb26'
-      yellow:  '#fabd2f'
-      blue:    '#83a598'
-      magenta: '#d3869b'
-      cyan:    '#8ec07c'
-      white:   '#ebdbb2'
-  gruvbox_dark: &gruvbox_light
-    primary:
-      background: '#fbf1c7'
-      foreground: '#3c3836'
-
-    normal:
-      black:   '#fbf1c7'
-      red:     '#cc241d'
-      green:   '#98971a'
-      yellow:  '#d79921'
-      blue:    '#458588'
-      magenta: '#b16286'
-      cyan:    '#689d6a'
-      white:   '#7c6f64'
-
-    bright:
-      black:   '#928374'
-      red:     '#9d0006'
-      green:   '#79740e'
-      yellow:  '#b57614'
-      blue:    '#076678'
-      magenta: '#8f3f71'
-      cyan:    '#427b58'
-      white:   '#3c3836'
diff --git a/symlinks/config/alacritty/colors.yml b/symlinks/config/alacritty/colors.yml
new file mode 100644
index 0000000..18cc312
--- /dev/null
+++ b/symlinks/config/alacritty/colors.yml
@@ -0,0 +1,24 @@
+colors:
+  primary:
+    background: '#282828'
+    foreground: '#ebdbb2'
+
+  normal:
+    black:   '#282828'
+    red:     '#cc241d'
+    green:   '#98971a'
+    yellow:  '#d79921'
+    blue:    '#458588'
+    magenta: '#b16286'
+    cyan:    '#689d6a'
+    white:   '#a89984'
+
+  bright:
+    black:   '#928374'
+    red:     '#fb4934'
+    green:   '#b8bb26'
+    yellow:  '#fabd2f'
+    blue:    '#83a598'
+    magenta: '#d3869b'
+    cyan:    '#8ec07c'
+    white:   '#ebdbb2'
diff --git a/symlinks/config/alacritty/font.yml b/symlinks/config/alacritty/font.yml
new file mode 100644
index 0000000..3979a73
--- /dev/null
+++ b/symlinks/config/alacritty/font.yml
@@ -0,0 +1,18 @@
+font:
+  normal:
+    family: SauceCodePro Nerd Font Mono
+    style: Regular
+
+  bold:
+    family: SauceCodePro Nerd Font Mono
+    style: Bold
+
+  italic:
+    family: SauceCodePro Nerd Font Mono
+    style: Italic
+
+  bold_italic:
+    family: SauceCodePro Nerd Font Mono
+    style: Bold Italic
+
+  size: 12.0
diff --git a/themes/gruvbox-dark/alacritty_colors.yml b/themes/gruvbox-dark/alacritty_colors.yml
new file mode 100644
index 0000000..18cc312
--- /dev/null
+++ b/themes/gruvbox-dark/alacritty_colors.yml
@@ -0,0 +1,24 @@
+colors:
+  primary:
+    background: '#282828'
+    foreground: '#ebdbb2'
+
+  normal:
+    black:   '#282828'
+    red:     '#cc241d'
+    green:   '#98971a'
+    yellow:  '#d79921'
+    blue:    '#458588'
+    magenta: '#b16286'
+    cyan:    '#689d6a'
+    white:   '#a89984'
+
+  bright:
+    black:   '#928374'
+    red:     '#fb4934'
+    green:   '#b8bb26'
+    yellow:  '#fabd2f'
+    blue:    '#83a598'
+    magenta: '#d3869b'
+    cyan:    '#8ec07c'
+    white:   '#ebdbb2'
diff --git a/themes/gruvbox-light/alacritty_colors.yml b/themes/gruvbox-light/alacritty_colors.yml
new file mode 100644
index 0000000..56921ed
--- /dev/null
+++ b/themes/gruvbox-light/alacritty_colors.yml
@@ -0,0 +1,24 @@
+colors:
+  primary:
+    background: '#fbf1c7'
+    foreground: '#3c3836'
+
+  normal:
+    black:   '#fbf1c7'
+    red:     '#cc241d'
+    green:   '#98971a'
+    yellow:  '#d79921'
+    blue:    '#458588'
+    magenta: '#b16286'
+    cyan:    '#689d6a'
+    white:   '#7c6f64'
+
+  bright:
+    black:   '#928374'
+    red:     '#9d0006'
+    green:   '#79740e'
+    yellow:  '#b57614'
+    blue:    '#076678'
+    magenta: '#8f3f71'
+    cyan:    '#427b58'
+    white:   '#3c3836'
diff --git a/themes/select-theme b/themes/select-theme
index 4d2e8fc..f06aaaa 100755
--- a/themes/select-theme
+++ b/themes/select-theme
@@ -18,6 +18,10 @@ cp $themedir/dunstcolors $configdir/dunst/dunstcolors
 cp $themedir/theme.vim $MY_VIM_HOME/theme.vim
 cp $themedir/fehbg $configdir/other-scripts/fehbg
 
+rm $configdir/alacritty/colors.yml.bak
+mv $configdir/alacritty/colors.yml $configdir/alacritty/colors.yml.bak
+ln -sT $themedir/alacritty_colors.yml $configdir/alacritty/colors.yml
+
 FG=black
 if [[ $theme == *"light"* ]]; then
 	FG=white
@@ -25,4 +29,4 @@ fi
 
 echo "PRIMARY_FG=$FG" > ~/.dotfiles/symlinks/zshrc.theme
 echo "$theme detected as a $FG theme"
-notify-send "$theme detected as $FG theme" --icon=dialog-information 
+notify-send "$theme detected as $FG theme" --icon=dialog-information