diff --git a/config/fish/conf.d/paths.fish b/config/fish/conf.d/paths.fish deleted file mode 100644 index 83a7054..0000000 --- a/config/fish/conf.d/paths.fish +++ /dev/null @@ -1,22 +0,0 @@ -function ___paths_plugin_set_colors - if not set -q ___paths_plugin_colors - set -Ux ___paths_plugin_colors 27e6ff 29e0ff 5cd8ff 77d0ff 8ac8ff 9cbfff afb5ff c5a7ff d99bfe ea8feb f684d5 fe7abd ff73a3 ff708a fa7070 ff708a ff73a3 fe7abd f684d5 ea8feb d99bfe c5a7ff afb5ff 9cbfff 8ac8ff 77d0ff 5cd8ff 29e0ff - end - return 0 -end - -function _paths_uninstall --on-event paths_uninstall - for i in ___paths_plugin_wrap_color ___paths_plugin_output ___paths_plugin_handle_found_item ___paths_plugin_handle_source ___paths_plugin_cycle_color - functions -e $i - end - set -e ___paths_plugin_colors - set -e ___paths_plugin_current_color -end - -function _paths_install --on-event _paths_install - ___paths_plugin_set_colors -end - -function _paths_update --on-event paths_update - ___paths_plugin_set_colors -end diff --git a/config/fish/config.fish b/config/fish/config.fish index b009858..bd906ab 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -8,9 +8,6 @@ test -e "$HOME/.config/fish/alias.fish" && test -e "$HOME/.config/fish/exports.fish" && source "$HOME/.config/fish/exports.fish" -test -e "$HOME/.config/fish/exports.secret.fish" && - source "$HOME/.config/fish/exports.secret.fish" - test -e "$HOME/.dotfiles/config/fzf/key-bindings.fish" && source "$HOME/.dotfiles/config/fzf/key-bindings.fish" diff --git a/config/fish/exports.fish b/config/fish/exports.fish index c013058..6166d33 100644 --- a/config/fish/exports.fish +++ b/config/fish/exports.fish @@ -22,11 +22,6 @@ fish_add_path "$XDG_BIN_HOME" # Add cargo bin to path fish_add_path "$XDG_SHARE_HOME/cargo/bin" -# Set Aqua configuration -set -q AQUA_BIN; or set -gx AQUA_BIN "$XDG_DATA_HOME/aquaproj-aqua/bin" -set -q AQUA_CONFIG; or set -gx AQUA_CONFIG "$XDG_CONFIG_HOME/aqua/aqua.yaml" -set -gx PATH $AQUA_BIN $PATH - # NPM/NVM configuration set -q NVM_DIR; or set -x NVM_DIR "$XDG_DATA_HOME/nvm" fish_add_path "$NVM_DIR/bin" @@ -109,7 +104,6 @@ set -q GNUPGHOME; or set -x GNUPGHOME "$XDG_DATA_HOME/gnupg" # Go configuration # set -q GOPATH; or set -x GOPATH "$XDG_DATA_HOME/go" set -q GOBIN; or set -x GOBIN "$XDG_BIN_HOME" -fish_add_path "$GOBIN" set -q GOENV_ROOT; or set -x GOENV_ROOT "$XDG_DATA_HOME/goenv" set -q GOENV_RC_FILE; or set -x GOENV_RC_FILE "$XDG_CONFIG_HOME/goenv/goenvrc.fish" @@ -131,7 +125,6 @@ set -q CARGO_HOME; or set -x CARGO_HOME "$XDG_DATA_HOME/cargo" set -q CARGO_BIN_HOME; or set -x CARGO_BIN_HOME "$XDG_BIN_HOME" set -q RUSTUP_HOME; or set -x RUSTUP_HOME "$XDG_DATA_HOME/rustup" set -x RUST_WITHOUT "clippy,docs,rls" -fish_add_path "$CARGO_BIN_HOME" fish_add_path "$CARGO_HOME/bin" fish_add_path "$XDG_SHARE_HOME/bob/nvim-bin" diff --git a/config/fish/fish_plugins b/config/fish/fish_plugins index 17c02e8..8720901 100644 --- a/config/fish/fish_plugins +++ b/config/fish/fish_plugins @@ -2,7 +2,6 @@ jorgebucaran/fisher ilancosman/tide@v6 jethrokuan/z halostatue/fish-macos@v7 -jgusta/paths danhper/fish-ssh-agent halostatue/fish-brew@v3 edc/bass diff --git a/config/fish/functions/paths.fish b/config/fish/functions/paths.fish deleted file mode 100644 index 09eccfd..0000000 --- a/config/fish/functions/paths.fish +++ /dev/null @@ -1,175 +0,0 @@ -function ___paths_plugin_wrap_color - set_color normal - set_color "$argv[1]" - echo -n (set_color "$argv[1]")"$argv[2..]" - set_color normal -end - -# duplicated in conf.d -function ___paths_plugin_set_colors - if not set -q ___paths_plugin_colors - set -Ux ___paths_plugin_colors 27e6ff 29e0ff 5cd8ff 77d0ff 8ac8ff 9cbfff afb5ff c5a7ff d99bfe ea8feb f684d5 fe7abd ff73a3 ff708a fa7070 ff708a ff73a3 fe7abd f684d5 ea8feb d99bfe c5a7ff afb5ff 9cbfff 8ac8ff 77d0ff 5cd8ff 29e0ff - end - return 0 -end - -function ___paths_plugin_cycle_color - if not set -q ___paths_plugin_current_color - set -Ux ___paths_plugin_current_color 1 - else if test $___paths_plugin_current_color -gt (count $___paths_plugin_colors) - set -Ux ___paths_plugin_current_color 1 - end - echo $___paths_plugin_colors[$___paths_plugin_current_color] - set -Ux ___paths_plugin_current_color (math $___paths_plugin_current_color + 1) -end - -function ___paths_plugin_handle_found_item -a testName outFlags - set -f flags (string split -n ' ' -- "$outFlags") - set -f options (fish_opt -s c -l clean) - set -a options (fish_opt -s s -l single) - set -a options (fish_opt -s k -l no-color) - set -a options (fish_opt -s n -l inline) - argparse $options -- $flags - - set -f arrow "=>" - # check if file exists - if test -e "$testName" - set -f nameOut (string trim -- "$testName") - if not set -q _flag_c # is not clean - if test -L "$testName" # is symlink - set -f __linkname (readlink -f "$testName") - set __linkname (string trim -- "$__linkname") - set testName (string trim -- "$testName") - if not set -q _flag_k # is color - set nameOut (___paths_plugin_wrap_color (___paths_plugin_cycle_color) $testName) (___paths_plugin_wrap_color "yellow" "$arrow") (___paths_plugin_wrap_color (___paths_plugin_cycle_color) $__linkname) - else # is color - set nameOut (echo -n "$testName" "$arrow" "$__linkname") - end - else # is not symlink - if not set -q _flag_k # is color - set testName (string trim -- "$testName") - set nameOut (___paths_plugin_wrap_color (___paths_plugin_cycle_color) "$testName") - else - set testName (string trim -- "$testName") - set nameOut "$testName" - end - end - - set nameOut (string trim -- "$nameOut") - # do the tick - if set -q _flag_k # is not color - set nameOut "- $nameOut" - else # is color - set nameOut (___paths_plugin_wrap_color "yellow" "-") "$nameOut" - end - end - set nameOut (string trim -- "$nameOut") - echo -n $nameOut - end -end - -function paths --description "Reveal the executable matches in shell paths or fish autoload." - set -f options (fish_opt -s c -l clean) - set -a options (fish_opt -s s -l single) - set -a options (fish_opt -s k -l no-color) - set -a options (fish_opt -s q -l quiet) - set -a options (fish_opt -s n -l inline) - argparse $options -- $argv - - if test (count $argv) -lt 1 - echo "paths - executable matches in shell paths or fish autoload." - and echo "usage: paths [-c|-s|-k] " - and echo -e "\t-c or --no-color: output without color" - and echo -e "\t-s or --single: output without color or headers, the first result" - and echo -e "\t-k or --clean: output without tick marks or headers" - # and echo -e "\t-n or --inline: output without endline" - and return 1 - end - - set -f foundStatus 1 - set -f input (string trim -- $argv) - # deprecated - if set -q _flag_q - set _flag_c True - end - - if set -q _flag_s - set _flag_k True - set _flag_c True - end - - set -f outFlags '' - set -q _flag_n; and set -a outFlags -n - set -q _flag_c; and set -a outFlags -c - set -q _flag_k; and set -a outFlags -k - set -q _flag_s; and set -a outFlags -s - set outFlags (string split -n " " -- "$outFlags") - ___paths_plugin_set_colors - # loop over list of path lists - for pVar in VIRTUAL_ENV fisher_path fish_function_path fish_user_paths PATH - set -e acc - set -f acc '' - set -e hit - # see if variable is empty - if test -z "$pVar" - continue - end - set -f acc (begin - for t in $$pVar - for snit in "$t/$input.fish" "$t/$input" - set -f found (___paths_plugin_handle_found_item "$snit" "$outFlags") - set found (string trim -- "$found") - if test -n "$found" - set -f hit True - echo "$found" - if set -q _flag_s - break - end - end - end - if set -q _flag_s - if set -q hit - break - end - end - end - end) - - # prepend source - if not set -q _flag_c - if set -q hit - set pVar (string trim -- "$pVar") - echo -e -n "$pVar\n" - end - end - - if test -n "$acc" - set foundStatus 0 - for fk in $acc - echo $fk - if set -q _flag_s - # stop after one - return $foundStatus - end - end - end - end - - # check - set -l built (type --type $input 12&>/dev/null) - if test -n "$built" - and test "$built" = 'builtin' - set $foundStatus 0 - if not set -q _flag_c - echo -e -n "builtin\n" - if set -q _flag_k - echo - "$input" - else # is color - echo (___paths_plugin_wrap_color "yellow" "-") (___paths_plugin_wrap_color (___paths_plugin_cycle_color) "$input") - end - else - echo "$input" - end - end - return $foundStatus -end