bash: cleanup

This commit is contained in:
2022-06-15 21:08:47 +03:00
parent f85c175b1f
commit 7d0760b1f1
2 changed files with 22 additions and 33 deletions

View File

@@ -1,25 +1 @@
if [ -s ~/.bashrc ]; then if [ -s ~/.bashrc ]; then . ~/.bashrc; fi
source ~/.bashrc;
fi
eval "$(rbenv init - --no-rehash)"
(rbenv rehash &) 2> /dev/null
eval "$(zoxide init bash)"
. /opt/homebrew/opt/asdf/libexec/asdf.sh
# eval "$(docker-machine env default)"
# export NVM_DIR="$HOME/.nvm"
# [ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh"
export PATH="/usr/local/opt/icu4c/bin:$PATH"
export PATH="/usr/local/opt/icu4c/sbin:$PATH"
export PATH="/opt/homebrew/sbin:$PATH"
export PATH="/opt/homebrew/opt/avr-gcc@8/bin:$PATH"
export PATH="/opt/homebrew/opt/arm-gcc-bin@8/bin:$PATH"
export PATH="/usr/local/sbin:$PATH"
export PATH="/usr/local/opt/avr-gcc@8/bin:$PATH"
export PATH="/usr/local/opt/arm-gcc-bin@8/bin:$PATH"
export PATH="/usr/local/opt/arm-gcc-bin@8/bin:$PATH"

View File

@@ -1,4 +1,5 @@
[ -f /etc/bashrc ] && . /etc/bashrc [ -f /opt/homebrew/opt/asdf/libexec/asdf.sh ] && . /opt/homebrew/opt/asdf/libexec/asdf.sh
# [ -f /etc/bashrc ] && . /etc/bashrc
[ -f /etc/bash_completion ] && . /etc/bash_completion [ -f /etc/bash_completion ] && . /etc/bash_completion
[ -f ~/.fzf.bash ] && . ~/.fzf.bash [ -f ~/.fzf.bash ] && . ~/.fzf.bash
[ -f ~/.cargo/env ] && . ~/.cargo/env [ -f ~/.cargo/env ] && . ~/.cargo/env
@@ -13,6 +14,8 @@ HISTCONTROL=ignoreboth
# Ignore more # Ignore more
HISTIGNORE='ls:ll:ls -alh:pwd:clear:history' HISTIGNORE='ls:ll:ls -alh:pwd:clear:history'
HISTIGNORE=$HISTIGNORE':gcom:gcob:gd:gdc:gc:gca:gcw:gs:ga:grm:gup:gp:gpf:gpt:gb:gg:gl:gr:gr1:gh' HISTIGNORE=$HISTIGNORE':gcom:gcob:gd:gdc:gc:gca:gcw:gs:ga:grm:gup:gp:gpf:gpt:gb:gg:gl:gr:gr1:gh'
HISTIGNORE=$HISTIGNORE':v:vi:nvim'
HISTIGNORE=$HISTIGNORE':k:kp:ks:d:dc:dcu:dcd:dcr:dcl'
# Immediately store command to the history # Immediately store command to the history
PROMPT_COMMAND='history -a' PROMPT_COMMAND='history -a'
@@ -24,7 +27,7 @@ shopt -s checkhash
shopt -s cmdhist # save multi-line commands in one shopt -s cmdhist # save multi-line commands in one
export BASH_SILENCE_DEPRECATION_WARNING=1 export BASH_SILENCE_DEPRECATION_WARNING=1
export RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/opt/openssl@1.1" export RUBY_CONFIGURE_OPTS="--with-openssl-dir=/opt/homebrew/opt/openssl@1.1"
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:.:/usr/local/lib
export EDITOR=nvim export EDITOR=nvim
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
@@ -95,6 +98,8 @@ alias dcd='docker-compose stop'
alias dcr='docker-compose restart' alias dcr='docker-compose restart'
alias dcl='docker-compose logs -tf --tail="50"' alias dcl='docker-compose logs -tf --tail="50"'
alias k='kubectl' alias k='kubectl'
alias kp='kubectx matic-production && kubens production'
alias ks='kubectx matic-staging && kubens staging'
alias rc='bin/rails c' alias rc='bin/rails c'
alias rs='bin/rails s -p3001' alias rs='bin/rails s -p3001'
@@ -116,14 +121,22 @@ fzf_kill() {
alias fkill='fzf_kill' alias fkill='fzf_kill'
# Homebrew stuff # Homebrew stuff
if [ -x /usr/local/bin/brew ]; then export MANPATH=/usr/local/share/man:$MANPATH
export PATH=/opt/homebrew/bin:/opt/homebrew/opt:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$PATH export PATH=/opt/homebrew/bin:/opt/homebrew/opt:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:$PATH
export MANPATH=/usr/local/share/man:$MANPATH
fi
export PATH="$HOME/.cargo/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH"
export PATH="/usr/local/opt/icu4c/bin:$PATH"
export PATH="/usr/local/opt/icu4c/sbin:$PATH"
export PATH="/opt/homebrew/sbin:$PATH"
export PATH="/opt/homebrew/opt/avr-gcc@8/bin:$PATH"
export PATH="/opt/homebrew/opt/arm-gcc-bin@8/bin:$PATH"
export PATH="/usr/local/sbin:$PATH"
export PATH="/usr/local/opt/avr-gcc@8/bin:$PATH"
export PATH="/usr/local/opt/arm-gcc-bin@8/bin:$PATH"
export PATH="/usr/local/opt/arm-gcc-bin@8/bin:$PATH"
if [ -e ~/.git-prompt.sh ]; then eval "$(zoxide init bash)"
if [ -s ~/.git-prompt.sh ]; then
source ~/.git-prompt.sh source ~/.git-prompt.sh
fi fi