From 1a74e28be78ea61214ec5e2306b534977093f040 Mon Sep 17 00:00:00 2001
From: T31M <t31m@cyberstuff.me>
Date: Sun, 31 Jan 2021 17:39:14 +0100
Subject: [PATCH] Adapted to Fisher 4.x plugin style

---
 fish/theme-t31m/{ => functions}/cdk.fish          |  0
 fish/theme-t31m/{ => functions}/envAWS.fish       |  0
 .../theme-t31m/{ => functions}/fish_greeting.fish |  0
 fish/theme-t31m/{ => functions}/fish_prompt.fish  |  0
 .../{ => functions}/fish_right_prompt.fish        |  0
 fish/theme-t31m/{ => functions}/fish_title.fish   |  0
 fish/theme-t31m/{ => functions}/ssm_tunnel.fish   |  0
 fish/theme-t31m/{ => functions}/t31m_prompt.fish  |  0
 .../{ => functions}/t31m_prompt_right.fish        |  0
 fish_setup.sh                                     | 15 ++++++++-------
 10 files changed, 8 insertions(+), 7 deletions(-)
 rename fish/theme-t31m/{ => functions}/cdk.fish (100%)
 rename fish/theme-t31m/{ => functions}/envAWS.fish (100%)
 rename fish/theme-t31m/{ => functions}/fish_greeting.fish (100%)
 rename fish/theme-t31m/{ => functions}/fish_prompt.fish (100%)
 rename fish/theme-t31m/{ => functions}/fish_right_prompt.fish (100%)
 rename fish/theme-t31m/{ => functions}/fish_title.fish (100%)
 rename fish/theme-t31m/{ => functions}/ssm_tunnel.fish (100%)
 rename fish/theme-t31m/{ => functions}/t31m_prompt.fish (100%)
 rename fish/theme-t31m/{ => functions}/t31m_prompt_right.fish (100%)

diff --git a/fish/theme-t31m/cdk.fish b/fish/theme-t31m/functions/cdk.fish
similarity index 100%
rename from fish/theme-t31m/cdk.fish
rename to fish/theme-t31m/functions/cdk.fish
diff --git a/fish/theme-t31m/envAWS.fish b/fish/theme-t31m/functions/envAWS.fish
similarity index 100%
rename from fish/theme-t31m/envAWS.fish
rename to fish/theme-t31m/functions/envAWS.fish
diff --git a/fish/theme-t31m/fish_greeting.fish b/fish/theme-t31m/functions/fish_greeting.fish
similarity index 100%
rename from fish/theme-t31m/fish_greeting.fish
rename to fish/theme-t31m/functions/fish_greeting.fish
diff --git a/fish/theme-t31m/fish_prompt.fish b/fish/theme-t31m/functions/fish_prompt.fish
similarity index 100%
rename from fish/theme-t31m/fish_prompt.fish
rename to fish/theme-t31m/functions/fish_prompt.fish
diff --git a/fish/theme-t31m/fish_right_prompt.fish b/fish/theme-t31m/functions/fish_right_prompt.fish
similarity index 100%
rename from fish/theme-t31m/fish_right_prompt.fish
rename to fish/theme-t31m/functions/fish_right_prompt.fish
diff --git a/fish/theme-t31m/fish_title.fish b/fish/theme-t31m/functions/fish_title.fish
similarity index 100%
rename from fish/theme-t31m/fish_title.fish
rename to fish/theme-t31m/functions/fish_title.fish
diff --git a/fish/theme-t31m/ssm_tunnel.fish b/fish/theme-t31m/functions/ssm_tunnel.fish
similarity index 100%
rename from fish/theme-t31m/ssm_tunnel.fish
rename to fish/theme-t31m/functions/ssm_tunnel.fish
diff --git a/fish/theme-t31m/t31m_prompt.fish b/fish/theme-t31m/functions/t31m_prompt.fish
similarity index 100%
rename from fish/theme-t31m/t31m_prompt.fish
rename to fish/theme-t31m/functions/t31m_prompt.fish
diff --git a/fish/theme-t31m/t31m_prompt_right.fish b/fish/theme-t31m/functions/t31m_prompt_right.fish
similarity index 100%
rename from fish/theme-t31m/t31m_prompt_right.fish
rename to fish/theme-t31m/functions/t31m_prompt_right.fish
diff --git a/fish_setup.sh b/fish_setup.sh
index 1a74f5a..e73564a 100755
--- a/fish_setup.sh
+++ b/fish_setup.sh
@@ -3,7 +3,7 @@
 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/v0.37.2/install.sh | bash
 
 # install pyenv
 git clone https://github.com/pyenv/pyenv.git ~/.pyenv
@@ -16,14 +16,15 @@ 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 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
@@ -35,9 +36,9 @@ cp fish/fishfile ~/.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
-fish -c "fisher add (pwd)/fish/theme-t31m"
+fish -c "fisher install jorgebucaran/fisher"
+fish -c "fisher update"
+fish -c "fisher install (pwd)/fish/theme-t31m"
 
 # set fish default shell
 echo "Change your default Shell to FiSH: chsh -s /usr/bin/fish"