fish/fish_plugins

@@ -1,3 +1,4 @@
-FabioAntunes/fish-nvm
+jorgebucaran/fisher
 edc/bass
 jethrokuan/fzf
+FabioAntunes/fish-nvm

fish_setup.sh

@@ -3,41 +3,39 @@
 set -x
 
 # install nvm
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/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
-if test -f "~/.config/fish/config.fish"; then
+if test -f "~/.config/fish/functions/config.fish"; then
     echo "config.fish already exist, please rename to continue."
     exit 1
 fi
-cp fish/config.fish ~/.config/fish/
+cp fish/config.fish ~/.config/fish/functions/
 
 # copy fishfile
-if test -f "~/.config/fish/fishfile"; then
+if test -f "~/.config/fish/fish_plugins"; then
-    echo "fishfile already exist, please rename to continue."
+    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 self-update"
+fish -c "fisher install jorgebucaran/fisher"
-fish -c fisher
+fish -c "fisher install (pwd)/fish/theme-t31m"
-fish -c "fisher add (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"