diff --git a/fish/fishfile b/fish/fish_plugins similarity index 69% rename from fish/fishfile rename to fish/fish_plugins index 29bc98e..6086f9e 100644 --- a/fish/fishfile +++ b/fish/fish_plugins @@ -1,3 +1,4 @@ -FabioAntunes/fish-nvm +jorgebucaran/fisher edc/bass jethrokuan/fzf +FabioAntunes/fish-nvm diff --git a/fish_setup.sh b/fish_setup.sh index e73564a..f12f506 100755 --- a/fish_setup.sh +++ b/fish_setup.sh @@ -3,20 +3,16 @@ set -x # install nvm -curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash +curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash # install pyenv git clone https://github.com/pyenv/pyenv.git ~/.pyenv -# install pyenv-virtualenv plugin -git clone https://github.com/pyenv/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv - # install fzf from source git clone --depth 1 https://github.com/junegunn/fzf.git ~/.fzf bash ~/.fzf/install --no-update-rc --completion --key-bindings # install fisher -#curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher $plugins # copy fish config @@ -27,18 +23,19 @@ fi cp fish/config.fish ~/.config/fish/functions/ # copy fishfile -if test -f "~/.config/fish/fishfile"; then - echo "fishfile already exist, please rename to continue." +if test -f "~/.config/fish/fish_plugins"; then + echo "fish_plugins already exist, please rename to continue." exit 1 fi -cp fish/fishfile ~/.config/fish/ +cp fish/fish_plugins ~/.config/fish/ echo "set --export PYENV_ROOT $HOME/.pyenv" > ~/.config/fish/conf.d/pyenv.fish # install packages from fishfile fish -c "fisher install jorgebucaran/fisher" -fish -c "fisher update" fish -c "fisher install (pwd)/fish/theme-t31m" +fish -c "fisher install FabioAntunes/fish-nvm" +fish -c "fisher update" # set fish default shell echo "Change your default Shell to FiSH: chsh -s /usr/bin/fish"