diff --git a/functions/setup.fish b/functions/setup.fish index 235630a..bda7ac2 100644 --- a/functions/setup.fish +++ b/functions/setup.fish @@ -79,7 +79,7 @@ function upin set remove "$pkg rm" alias lock="$pkg al" set ALIASSES "-- I see.. you're using OpenSUSE. i like <3 -- - -- ZYPPER -- " + -- ZYPPER -- " end # ─< APK - Alpine >───────────────────────────────────────────────────────────────────────── @@ -171,17 +171,20 @@ end # │ FUNCTION: check fisher plugin dependencies │ # ╰────────────────────────────────────────────╯ function dep_fisher - # Define dependencies for the plugins used by fisher - set dependencies "fzf" - # Check and install dependencies - for dep in $dependencies - if not command -v $dep >/dev/null 2>&1 - echo "Dependency $dep is not installed. Installing..." - if test -n "$FISH_INSTALL" - alias fish_install="$FISH_INSTALL" - fish_install $dep - else - echo "FISH_INSTALL is not defined: $FISH_INSTALL | Please install $dep manually." +# ─< Define dependencies for the plugins used by fisher >─────────────────────────────────── + begin + set dependencies "fzf" "rg" + alias rg="ripgrep" +# ─< Check and install dependencies >─────────────────────────────────────────────────────── + for dep in $dependencies + if not command -v $dep >/dev/null 2>&1 + echo "Dependency $dep is not installed. Installing..." + if test -n "$FISH_INSTALL" + alias fish_install="$FISH_INSTALL" + fish_install $dep + else + echo "FISH_INSTALL is not defined: $FISH_INSTALL | Please install $dep manually." + end end end end @@ -191,32 +194,15 @@ end # │ FUNCTION: check for fisher and install if not present │ # ╰───────────────────────────────────────────────────────╯ -function inst_fisher - fisher install jorgebucaran/fisher -end - -function check_fisher - set check_fisher = "false" - while $check_fisher != "true" - echo "check_fisher == flase" - sleep 1 - # if $check_fisher = "true" - fisher update >/dev/null 2>&1 - switch $status - case 0 - set -U check_fisher "true" - echo "check_fisher == true" - sleep 1 - case '*' - if test ! -e $HOME/.config/fish/functions/fisher.fish - curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish >> $HOME/.config/fish/functions/fisher.fish - inst_fisher - end - end +begin +function check_fishr + if test ! -e $HOME/.config/fish/functions/fisher.fish && test ! -e $HOME/.config/fish/.fishr.init + echo "you did it!!"> $HOME/.config/fish/.fishr.init && curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher end end +end # ────────────────────────────────────< setup some stuff >──────────────────────────────────── upin dep_fisher -check_fisher +check_fishr