diff --git a/.gitconfig b/.gitconfig index ca85193..e3ea564 100644 --- a/.gitconfig +++ b/.gitconfig @@ -9,8 +9,11 @@ s = status co = checkout ac = !git add -A && git commit -m + ao = remote add origin undo = reset HEAD~1 --mixed res = !git reset --hard done = !git push origin HEAD lg = !git log --pretty=format:\"%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) [%an]\" --abbrev-commit -30A del = branch -D +[pull] + rebase = false diff --git a/.zshrc b/.zshrc index 8f33048..9c98ab6 100644 --- a/.zshrc +++ b/.zshrc @@ -107,4 +107,15 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr export STARSHIP_CONFIG=~/.config/starship.toml +export OPENSSL_CONF=/dev/null +eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" +# bun completions +[ -s "/home/bravo68web/.bun/_bun" ] && source "/home/bravo68web/.bun/_bun" + +# Bun +export BUN_INSTALL="/home/bravo68web/.bun" +export PATH="$BUN_INSTALL/bin:$PATH" + +export FLYCTL_INSTALL="/home/bravo68web/.fly" +export PATH="$FLYCTL_INSTALL/bin:$PATH"