fix calling of the alacritty-import.sh script and the script itself too
This commit is contained in:
parent
4e7c2ee524
commit
4a24cfc91c
2
.bashrc
2
.bashrc
|
@ -1,6 +1,6 @@
|
||||||
# shellcheck disable=SC2139
|
# shellcheck disable=SC2139
|
||||||
# The above directive disables https://www.shellcheck.net/wiki/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
|
unalias -a
|
||||||
if [[ "$(uname)" == 'Linux' ]]; then
|
if [[ "$(uname)" == 'Linux' ]]; then
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
# All imports must either be absolute paths starting with `/`, or paths relative
|
# All imports must either be absolute paths starting with `/`, or paths relative
|
||||||
# to the user's home directory starting with `~/`.
|
# to the user's home directory starting with `~/`.
|
||||||
import:
|
import:
|
||||||
- ~/.config/alacritty/load_intermediate.yml
|
- ~/.config/alacritty/platform.yml
|
||||||
|
|
||||||
# Any items in the `env` entry below will be added as
|
# Any items in the `env` entry below will be added as
|
||||||
# environment variables. Some entries may override variables
|
# environment variables. Some entries may override variables
|
||||||
|
|
|
@ -33,12 +33,9 @@ end
|
||||||
function fish_mode_prompt
|
function fish_mode_prompt
|
||||||
end
|
end
|
||||||
|
|
||||||
function setup_alacritty_for_os
|
|
||||||
bash "$HOME/.local/scripts/other-common-scripts/alacritty-import.sh" &
|
|
||||||
end
|
|
||||||
|
|
||||||
function initial_fish_setup
|
function initial_fish_setup
|
||||||
setup_alacritty_for_os
|
bash "$HOME/.local/scripts/other-common-scripts/alacritty-import.sh" &
|
||||||
fish_load_sudo_alias
|
fish_load_sudo_alias
|
||||||
fish_vi_key_bindings
|
fish_vi_key_bindings
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
.cargo/*
|
.cargo/*
|
||||||
.config/*.xml*
|
.config/*.xml*
|
||||||
.config/.gsd-keyboard.settings-ported
|
.config/.gsd-keyboard.settings-ported
|
||||||
.config/alacritty/load_intermediate.yml
|
.config/alacritty/platform.yml
|
||||||
.config/bottom/*
|
.config/bottom/*
|
||||||
.config/btop/*
|
.config/btop/*
|
||||||
.config/dconf/*
|
.config/dconf/*
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
set -euf
|
set -eu
|
||||||
|
|
||||||
if [ ! -f "${HOME}/.config/alacritty/load_intermediate.yml" ]; then
|
if [[ ! -f "${HOME}/.config/alacritty/platform.yml" ]]; then
|
||||||
if uname | grep -q Linux; then
|
if [[ "$(uname -s)" == 'Linux' ]]; then
|
||||||
ln -s "${HOME}/.config/alacritty/load_linux.yml" "${HOME}/.config/alacritty/load_intermediate.yml"
|
ln -s "${HOME}/.config/alacritty/"{linux,platform}.yml
|
||||||
else
|
elif [[ "$(uname -s)" == 'Darwin' ]]; then
|
||||||
ln -s "${HOME}/.config/alacritty/load_macos.yml" "${HOME}/.config/alacritty/load_intermediate.yml"
|
ln -s "${HOME}/.config/alacritty/"{darwin,platform}.yml
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue