diff --git a/configuration/config.fish b/configuration/config.fish index c22f21e..6833fea 100644 --- a/configuration/config.fish +++ b/configuration/config.fish @@ -37,3 +37,5 @@ set -x ANDROID_HOME /Users/michaelrobinson/Library/Android/sdk set -x FZF_DEFAULT_COMMAND 'ag -p ~/.gitignore -g ""' # set -x FZF_DEFAULT_COMMAND = 'ag --ignore node_modules -g ""' +starship init fish | source + diff --git a/configuration/fishfile b/configuration/fishfile index 648bb36..15b416a 100644 --- a/configuration/fishfile +++ b/configuration/fishfile @@ -23,5 +23,5 @@ fishpkg/fish-humanize-duration # Themes # daveyarwood/tomita # rafaelrinaldi/pure -faceleg/simple:master +# faceleg/simple:master # simple diff --git a/installers/fish.sh b/installers/fish.sh index df856d4..0300666 100755 --- a/installers/fish.sh +++ b/installers/fish.sh @@ -15,14 +15,12 @@ else git clone https://github.com/chriskempson/base16-shell.git $BASE16 fi -#printf "\nInstall hub check" -#if command -v hub >/dev/null 2>&1; then -# curl https://raw.githubusercontent.com/github/hub/master/etc/hub.fish_completion > ~/.config/fish/completions/hub.fish -#else -# printf "\nhub command does not exist, install before continuing \n\nbrew install hub" -# exit 1 -#fi - +printf "\nInstall starship check" +if command -v starship >/dev/null 2>&1; then + printf "\nStarship is installed" +else + curl -fsSL https://starship.rs/install.sh | bash +fi printf "\nReplacing fish.config\n" rm -fv ~/.config/fish.config @@ -30,3 +28,4 @@ mkdir -p ~/.config/fish $CP "$DIR/../configuration/fishfile" ~/.config/fish/fishfile $CP "$DIR/../configuration/config.fish" ~/.config/fish/config.fish $CP "$DIR/../configuration/logo.txt" ~/.config/fish/logo.txt +