Skip to content

Commit

Permalink
config(zsh) sanitize merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@yannvr
yannvr committed Feb 8, 2023
1 parent d7d7790 commit 4fd24c7
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 57 deletions.
1 change: 0 additions & 1 deletion .zshenv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
source ~/.zshrc.alias

37 changes: 6 additions & 31 deletions .zshrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ ZSH_THEME="wezm"
ENABLE_CORRECTION="false"
DISABLE_UNTRACKED_FILES_DIRTY="true"
# plugins=(fzf colored-man-pages yarn brew cp git gitfast history node npm nvm themes web-search zsh-navigation-tools z zsh_reload pip themes)
# plugins=(fzf colored-man-pages yarn brew cp git gitfast history node npm nvm themes web-search zsh-navigation-tools z pip)
plugins=(fzf yarn brew cp git gitfast history zsh-navigation-tools z pip)
source $ZSH/oh-my-zsh.sh

Expand Down Expand Up @@ -76,7 +75,7 @@ bindkey "^T" znt-cd-widget
# bindkey '^I' expand-or-complete


eval $(thefuck --alias)
# eval $(thefuck --alias)

# place this after nvm initialization!
autoload -U add-zsh-hook
Expand All @@ -101,34 +100,10 @@ set rtp+=/usr/local/opt/fzf
# add-zsh-hook chpwd load-nvmrc
# load-nvmrc

if [[ -z `which pyenv` ]]
then
eval "$(pyenv init -)"
fi
# if [[ -z `which pyenv` ]]
# then
# eval "$(pyenv init -)"
# eval "$(pyenv virtualenv-init -)"
# fi

# zprof
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
export PATH="/usr/local/opt/python@3.7/bin:$PATH"
25 changes: 10 additions & 15 deletions .zshrc-e
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ export FZF_ALT_T_COMMAND="$FZF_DEFAULT_COMMAND"
export NVIM_TUI_ENABLE_TRUE_COLOR=1
export EDTIOR=/usr/local/bin/vim

# if [ -f /usr/local/opt/nvm/nvm.sh ]; then
# export NVM_DIR="$HOME/.nvm"
# . "/usr/local/opt/nvm/nvm.sh"
# fi
if [ -f /usr/local/opt/nvm/nvm.sh ]; then
export NVM_DIR="$HOME/.nvm"
. "/usr/local/opt/nvm/nvm.sh"
fi

# if [ hash pyeven 2>/dev/null ]; then
# export PYENV_ROOT="$HOME/.pyenv"
# export PATH="$PYENV_ROOT/bin:$PATH"
# eval "$(pyenv init -)" 2&>1 > /dev/null
# eval "$(pyenv virtualenv-init -)" 2&>1 > /dev/null
# fi
if [ hash pyeven 2>/dev/null ]; then
export PYENV_ROOT="$HOME/.pyenv"
export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)" 2&>1 > /dev/null
eval "$(pyenv virtualenv-init -)" 2&>1 > /dev/null
fi


# # Source chtf
Expand All @@ -34,11 +34,6 @@ export NVM_DIR="$HOME/.nvm"


YARN_GLOBAL_BIN=`yarn global dir`/.bin
export ANDROID_HOME=$HOME/Library/Android/sdk
export PATH=$PATH:$ANDROID_HOME/emulator
export PATH=$PATH:$ANDROID_HOME/tools
export PATH=$PATH:$ANDROID_HOME/tools/bin
export PATH=$PATH:$ANDROID_HOME/platform-tools
export PATH=$YARN_GLOBAL_BIN:/usr/local/opt/python/libexec/bin/:$PATH
# export PATH=$YARN_GLOBAL_BIN:/usr/local/opt/python/libexec/bin/:$PATH
export PATH=$YARN_GLOBAL_BIN:$PATH
19 changes: 9 additions & 10 deletions .zshrc.local
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
a onboard-commerzbank='python dbsetup/scripts/glide_createuser.py --endpoint https://commerzbank.alphakinetic.com:34000/json --username jacky_zhang --password akrcm2017 --environment commerzbank csv --filename ~/Documents/glide-onboarding-accounts.csv'
a onboard-hayfin-test='python dbsetup/scripts/glide_createuser.py --endpoint https://hayfin-test.alphakinetic.com:34000/json --username jacky_zhang --password akrcm2017 --environment hayfin-test csv --filename ~/Documents/glide-onboarding-accounts.csv'
a onboard-rcm-test='python dbsetup/scripts/glide_createuser.py --endpoint https://rcm-test.alphakinetic.com:34000/json --username jacky_zhang --password akrcm2017 --environment rcm-test csv --filename ~/Documents/glide-onboarding-accounts.csv'


export NVM_DIR="$HOME/.nvm"
[ -s "/usr/local/opt/nvm/nvm.sh" ] && . "/usr/local/opt/nvm/nvm.sh" # This loads nvm
[ -s "/usr/local/opt/nvm/etc/bash_completion" ] && . "/usr/local/opt/nvm/etc/bash_completion" # This loads nvm bash_completion

echo 'export PATH="/usr/local/opt/python@3.7/bin:$PATH"' >> ~/.zshrc
# eval "$(pyenv init -)"
# alias brew='env PATH="${PATH//$(pyenv root)\/shims:/}" brew'
export ANDROID_SDK=/Users/yannvr/Library/Android/sdk
export ANDROID_HOME=/Users/yannvr/Library/Android
export ANDROID_HOME=$HOME/Library/Android/sdk
export PATH=$PATH:$ANDROID_HOME/emulator
export PATH=$PATH:$ANDROID_HOME/tools
export PATH=$PATH:$ANDROID_HOME/tools/bin
export PATH=$PATH:$ANDROID_HOME/platform-tools

0 comments on commit 4fd24c7

Please sign in to comment.