Merge branch 'master' of git.caraus.tech:belka/dotfiles

This commit is contained in:
Eugen Wissner 2025-02-28 15:24:16 +01:00
commit 58f798d7c0
Signed by: belka
GPG Key ID: A27FDC1E8EE902C0
2 changed files with 7 additions and 6 deletions

View File

@ -1,15 +1,17 @@
PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.ghcup/bin:$HOME/.cabal/bin:$PATH" PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.ghcup/bin:$HOME/.cabal/bin:$HOME/.rd/bin:$PATH"
if [ -x /opt/homebrew/bin/brew ] if [ -x /opt/homebrew/bin/brew ]
then then
eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(/opt/homebrew/bin/brew shellenv)"
PATH="/usr/local/bin:$PATH" # Overriding Mac OS provided binutils breakes cross compiling binutils. But
# the binutils project also provides "g"-prefixed binaries.
PATH="/usr/local/bin:$PATH:$HOMEBREW_PREFIX/opt/binutils/bin"
for tool in flex bison for tool in flex bison
do do
PATH="$HOMEBREW_PREFIX/opt/$tool/bin:$PATH" PATH="$HOMEBREW_PREFIX/opt/$tool/bin:$PATH"
done done
for tool in libtool coreutils grep gnu-sed findutils make for tool in libtool coreutils grep gnu-sed findutils make gpatch
do do
PATH="$HOMEBREW_PREFIX/opt/$tool/libexec/gnubin:$PATH" PATH="$HOMEBREW_PREFIX/opt/$tool/libexec/gnubin:$PATH"
done done

View File

@ -19,12 +19,11 @@ alias rdpwin='xfreerdp /f /sound /v:192.168.0.4 /u:belka@caraus.de'
command -v rbenv >/dev/null 2>&1 && eval "$(rbenv init -)" command -v rbenv >/dev/null 2>&1 && eval "$(rbenv init -)"
command -v fastfetch >/dev/null 2>&1 && fastfetch command -v fastfetch >/dev/null 2>&1 && fastfetch
echo $YASH_AFTER_CD
read_project_env() { read_project_env() {
test -x .env.sh && . .env.sh test -x .env.sh && . .env.sh || true
} }
read_project_env read_project_env
YASH_AFTER_CD=read_project_env YASH_AFTER_CD="read_project_env"
# vim: set ft=sh: # vim: set ft=sh: