From 4a24cfc91c281bebee8f41ce357542f0a87298fe Mon Sep 17 00:00:00 2001
From: Pratham Patel <thefirst1322@gmail.com>
Date: Sat, 6 Jan 2024 21:53:22 +0530
Subject: [PATCH] fix calling of the alacritty-import.sh script and the script
 itself too

---
 .bashrc                                              |  2 +-
 .config/alacritty/alacritty.yml                      |  2 +-
 .config/alacritty/{load_macos.yml => darwin.yml}     |  0
 .config/alacritty/{load_linux.yml => linux.yml}      |  0
 .config/fish/config.fish                             |  5 +----
 .gitignore                                           |  2 +-
 .../scripts/other-common-scripts/alacritty-import.sh | 12 ++++++------
 7 files changed, 10 insertions(+), 13 deletions(-)
 rename .config/alacritty/{load_macos.yml => darwin.yml} (100%)
 rename .config/alacritty/{load_linux.yml => linux.yml} (100%)

diff --git a/.bashrc b/.bashrc
index e1f2b96..f1f1e78 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,6 +1,6 @@
 # shellcheck disable=SC2139
 # The above directive disables https://www.shellcheck.net/wiki/SC2139
-dash "${HOME}/.local/scripts/other-common-scripts/alacritty-import.sh"
+bash "${HOME}/.local/scripts/other-common-scripts/alacritty-import.sh" &
 
 unalias -a
 if [[ "$(uname)" == 'Linux' ]]; then
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 19a569f..8fd9694 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -9,7 +9,7 @@
 # All imports must either be absolute paths starting with `/`, or paths relative
 # to the user's home directory starting with `~/`.
 import:
-  - ~/.config/alacritty/load_intermediate.yml
+  - ~/.config/alacritty/platform.yml
 
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
diff --git a/.config/alacritty/load_macos.yml b/.config/alacritty/darwin.yml
similarity index 100%
rename from .config/alacritty/load_macos.yml
rename to .config/alacritty/darwin.yml
diff --git a/.config/alacritty/load_linux.yml b/.config/alacritty/linux.yml
similarity index 100%
rename from .config/alacritty/load_linux.yml
rename to .config/alacritty/linux.yml
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 25404a9..a3e8579 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -33,12 +33,9 @@ end
 function fish_mode_prompt
 end
 
-function setup_alacritty_for_os
-    bash "$HOME/.local/scripts/other-common-scripts/alacritty-import.sh" &
-end
 
 function initial_fish_setup
-    setup_alacritty_for_os
+    bash "$HOME/.local/scripts/other-common-scripts/alacritty-import.sh" &
     fish_load_sudo_alias
     fish_vi_key_bindings
 end
diff --git a/.gitignore b/.gitignore
index 355b35f..ae9c48f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 .cargo/*
 .config/*.xml*
 .config/.gsd-keyboard.settings-ported
-.config/alacritty/load_intermediate.yml
+.config/alacritty/platform.yml
 .config/bottom/*
 .config/btop/*
 .config/dconf/*
diff --git a/.local/scripts/other-common-scripts/alacritty-import.sh b/.local/scripts/other-common-scripts/alacritty-import.sh
index e2b206f..97df6b8 100755
--- a/.local/scripts/other-common-scripts/alacritty-import.sh
+++ b/.local/scripts/other-common-scripts/alacritty-import.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-set -euf
+set -eu
 
-if [ ! -f "${HOME}/.config/alacritty/load_intermediate.yml" ]; then
-    if uname | grep -q Linux; then
-        ln -s "${HOME}/.config/alacritty/load_linux.yml" "${HOME}/.config/alacritty/load_intermediate.yml"
-    else
-        ln -s "${HOME}/.config/alacritty/load_macos.yml" "${HOME}/.config/alacritty/load_intermediate.yml"
+if [[ ! -f "${HOME}/.config/alacritty/platform.yml" ]]; then
+    if [[ "$(uname -s)" == 'Linux' ]]; then
+        ln -s "${HOME}/.config/alacritty/"{linux,platform}.yml
+    elif [[ "$(uname -s)" == 'Darwin' ]]; then
+        ln -s "${HOME}/.config/alacritty/"{darwin,platform}.yml
     fi
 fi