diff --git a/config/fish/fish_variables b/config/fish/fish_variables index a6cd728..9004d19 100644 --- a/config/fish/fish_variables +++ b/config/fish/fish_variables @@ -11,6 +11,8 @@ SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR _hydro_git_64715:main\u2022\x20 SETUVAR _hydro_git_69626:main\u2022\x20 SETUVAR _hydro_git_72501:main\u2022\x20\u21911\x20 +SETUVAR _hydro_git_92996:main\u2022\x20 +SETUVAR _hydro_git_93415:main\u2022\x20 SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr SETUVAR fish_color_command:005fd7 diff --git a/zpreztorc b/zpreztorc deleted file mode 100644 index 65c0f27..0000000 --- a/zpreztorc +++ /dev/null @@ -1,26 +0,0 @@ -zstyle ':prezto:*:*' color 'yes' -zstyle ':prezto:load' zmodule 'attr' 'stat' -zstyle ':prezto:load' zfunction 'zargs' 'zmv' -zstyle ':prezto:load' pmodule \ - 'environment' \ - 'history' \ - 'history-substring-search' \ - 'utility' \ - 'completion' \ - 'git' \ - 'ruby' \ - 'prompt' \ - 'tmux' - -zstyle ':prezto:module:autosuggestions:color' found '' -zstyle ':prezto:module:editor' key-bindings 'emacs' -zstyle ':prezto:module:editor' dot-expansion 'yes' -zstyle ':prezto:module:editor' ps-context 'yes' -zstyle ':prezto:module:git:status:ignore' submodules 'all' -zstyle ':prezto:module:prompt' theme 'paradox' -zstyle ':prezto:module:prompt' long-pwd 'yes' -zstyle ':prezto:module:terminal:multiplexer-title' format '%s' -zstyle ':prezto:module:tmux:auto-start' local 'yes' -zstyle ':prezto:module:tmux' session 'AddgeneImac' -zstyle ':prezto:module:python:info:virtualenv' format 'v:% v' - diff --git a/zprofile.local b/zprofile.local deleted file mode 100644 index e69de29..0000000 diff --git a/zshrc b/zshrc deleted file mode 100644 index eb9cdc5..0000000 --- a/zshrc +++ /dev/null @@ -1,45 +0,0 @@ -if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then - source "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" -fi - -source ~/.zshrc.local - - -# Add RVM to PATH for scripting. Make sure this is the last PATH variable change. -export EDITOR="vim" -eval "$(direnv hook zsh)" -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm - - -autoload -U add-zsh-hook -load-nvmrc() { - local node_version="$(nvm version)" - local nvmrc_path="$(nvm_find_nvmrc)" - - if [ -n "$nvmrc_path" ]; then - local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")") - - if [ "$nvmrc_node_version" = "N/A" ]; then - nvm install - elif [ "$nvmrc_node_version" != "$node_version" ]; then - nvm use - fi - elif [ "$node_version" != "$(nvm version default)" ]; then - echo "Reverting to nvm default version" - nvm use default - fi -} -add-zsh-hook chpwd load-nvmrc -load-nvmrc - -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -eval "$(pyenv init -)" - -export PATH="$HOME/.rvm/bin:$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" - -# The next line updates PATH for the Google Cloud SDK. -if [ -f '/Users/tyrel/Downloads/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/tyrel/Downloads/google-cloud-sdk/path.zsh.inc'; fi - -# The next line enables shell command completion for gcloud. -if [ -f '/Users/tyrel/Downloads/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/tyrel/Downloads/google-cloud-sdk/completion.zsh.inc'; fi diff --git a/zshrc.local b/zshrc.local deleted file mode 100644 index 968771a..0000000 --- a/zshrc.local +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/local/bin/zsh - -export EDITOR=vim -export MP_FULLNAME="Tyrel Souza" -export VISUAL=$EDITOR -export LANG=en_US.UTF-8 -export LC_ALL=$LANG -export LESS=' -R ' -export LESSOPEN="| /usr/local/bin/src-hilite-lesspipe.sh %s" - -# Python Virtualenv + Wrapper -export VIRTUALENVWRAPPER_PYTHON="/usr/local/opt/python/libexec/bin/python" -export WORKON_HOME=$HOME/.virtualenvs -if [ -e $HOME/.local/bin/virtualenvwrapper.sh ];then - source $HOME/.local/bin/virtualenvwrapper.sh -elif [ -e /usr/local/bin/virtualenvwrapper.sh ]; then - source /usr/local/bin/virtualenvwrapper.sh -fi -export PYTHONSTARTUP=$HOME/.pythonstartup.py - -# Node stuff -export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" -export NPM_PACKAGES="${HOME}/.npm-packages" -export PATH="$HOME/bin:$PATH" -export PATH="/usr/local/opt/python/libexec/bin:$PATH" - -# Go Stuff -export GOPATH=$HOME/go - -# GPG stuff -if [[ $OSTYPE == "darwin*" ]];then - echo "On Macos" - export PATH="/usr/local/opt/gnupg/libexec/gpgbin:$PATH" - export CFLAGS="-I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib" - export LDFLAGS="-L/usr/local/opt/icu4c/lib" - export CPPFLAGS="-I/usr/local/opt/icu4c/include" - export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig" - #LDFLAGS: -L/usr/local/opt/mariadb@10.1/lib - #CPPFLAGS: -I/usr/local/opt/mariadb@10.1/include - #PKG_CONFIG_PATH: /usr/local/opt/mariadb@10.1/share/pkgconfig -fi - - - -source ~/.bash_aliases -unsetopt share_history -export PATH=/usr/local/bin:$PATH -