jam/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

path cleanup

Browse Source
This commit is contained in:
James Dixon 2022-08-10 06:30:59 -04:00
parent b3ece99c18
commit b68eb8a0e8
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
config/zsh/.zshrc
View File

@ -240,11 +240,11 @@ PROMPT='%F{blue}%~$(git_prompt) %F{cyan}%# %F{reset}'
# rbenv (ruby) # rbenv (ruby)
src_rbenv(){ src_rbenv(){
if command -v ruby > /dev/null && command -v gem > /dev/null; then if command -v ruby > /dev/null && command -v gem > /dev/null; then
path+=("$(ruby -r rubygems -e 'puts Gem.user_dir')/bin") path+=("$(ruby -r rubygems -e 'puts Gem.user_dir')/bin")
# rbenv shim # rbenv shim
if [ -d "$HOME/.rbenv/bin" ]; then if [ -d "$HOME/.rbenv/bin" ]; then
path+=("$HOME/.rbenv/bin") path+=("$HOME/.rbenv/bin")
[[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init -)" [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]] && eval "$(rbenv init - zsh)"
fi fi
fi fi
} }
@ -262,34 +262,42 @@ src_nvm(){
src_pyenv() { src_pyenv() {
if [ -d "$HOME/.pyenv" ]; then if [ -d "$HOME/.pyenv" ]; then
export PYENV_ROOT="$HOME/.pyenv" export PYENV_ROOT="$HOME/.pyenv"
path+=("$PYENV_ROOT/bin") path+=("$PYENV_ROOT/bin")
command -v pyenv > /dev/null && eval "$(pyenv init -)" command -v pyenv > /dev/null && eval "$(pyenv init -)"
fi fi
} }
# * * * * * * * * * * * * *
# Language Specific Paths *
# * * * * * * * * * * * * *
#python
# path+=("/Users/james/Library/Python/3.8/bin")
# ruby
if command -v rbenv > /dev/null; then eval "$(rbenv init -)"; fi
# go # go
if command -v go > /dev/null; then src_go() {
# move go path from ~/go to ~/.go (hidden)
[ -d "$HOME/go" ] && mv "$HOME/go" "$HOME/.go" [ -d "$HOME/go" ] && mv "$HOME/go" "$HOME/.go"
export GOPATH="$HOME/.go" export GOPATH="$HOME/.go"
export GOWD="$GOPATH/src/github.com/lemonase" export GOWD="$GOPATH/src/github.com/lemonase"
export GOMOD="$GOPATH/pkg/mod/github.com/lemonase/" export GOMOD="$GOPATH/pkg/mod/github.com/lemonase/"
path+=("$(go env GOPATH)/bin") path+=("$(go env GOPATH)/bin")
}
# rust/cargo
src_rust() {
path+=("$HOME/.cargo/bin")
}
# ruby
if command -v rbenv > /dev/null; then
src_rbenv
fi
# go
if command -v go > /dev/null; then
src_go
fi fi
# rust # rust
if command -v cargo > /dev/null; then if command -v cargo > /dev/null; then
path+=("$HOME/.cargo/bin") src_rust
fi fi
# * * * * * * * * * * * * # * * * * * * * * * * * *
# MISC $PATH Additions * # MISC $PATH Additions *
# * * * * * * * * * * * * # * * * * * * * * * * * *
@ -297,6 +305,10 @@ fi
[ -d "/opt/homebrew/bin" ] && path+=("/opt/homebrew/bin" $path) [ -d "/opt/homebrew/bin" ] && path+=("/opt/homebrew/bin" $path)
[ -d "/opt/homebrew/opt/sqlite/bin" ] && path+=("/opt/homebrew/opt/sqlite/bin" $path) [ -d "/opt/homebrew/opt/sqlite/bin" ] && path+=("/opt/homebrew/opt/sqlite/bin" $path)
# misc
# [ -d "$HOME/.rbenv" ] && path+=("$HOME/.rbenv/bin") && eval "$(rbenv init - zsh)"
# [ -d "/Users/james/Library/Python/3.8/bin" ] && path+=("/Users/james/Library/Python/3.8/bin")
# local bins # local bins
[ -d "$HOME/.local/bin" ] && path+=("$HOME/.local/bin") [ -d "$HOME/.local/bin" ] && path+=("$HOME/.local/bin")
[ -d "$HOME/.local/scripts" ] && path+=("$HOME/.local/scripts") [ -d "$HOME/.local/scripts" ] && path+=("$HOME/.local/scripts")
@ -305,7 +317,6 @@ fi
[ -r "$HOME/.config/zshrc" ] && source "$HOME/.config/zshrc" [ -r "$HOME/.config/zshrc" ] && source "$HOME/.config/zshrc"
[ -r "$HOME/.local/zshrc" ] && source "$HOME/.local/zshrc" [ -r "$HOME/.local/zshrc" ] && source "$HOME/.local/zshrc"
[ -d "$HOME/.rbenv" ] && path+=("$HOME/.rbenv/bin") && eval "$(rbenv init - zsh)"
# ZSH syntax highlighting plugin # ZSH syntax highlighting plugin
ZSH_SYNTAX_HIGHLIGHT_PATH="${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ZSH_SYNTAX_HIGHLIGHT_PATH="${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"