From ec728fbbdf2b43ef0f8dd618a9aa555c40b0aa95 Mon Sep 17 00:00:00 2001 From: "shinnosuke.suzuki" Date: Tue, 9 Apr 2024 13:13:00 +0900 Subject: [PATCH 1/2] =?UTF-8?q?asdf=20=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/fish/completions/asdf.fish | 131 ----------------------------- .config/fish/conf.d/asdf.fish | 11 --- .config/fish/config.fish | 7 +- .config/fish/fish_plugins | 1 - .config/fish/fish_variables | 3 +- 5 files changed, 3 insertions(+), 150 deletions(-) delete mode 100644 .config/fish/completions/asdf.fish delete mode 100644 .config/fish/conf.d/asdf.fish diff --git a/.config/fish/completions/asdf.fish b/.config/fish/completions/asdf.fish deleted file mode 100644 index a1cadc1..0000000 --- a/.config/fish/completions/asdf.fish +++ /dev/null @@ -1,131 +0,0 @@ -set -x asdf_data_dir ( - if test -n "$ASDF_DATA_DIR"; echo $ASDF_DATA_DIR; - else; echo $HOME/.asdf; end) - -function __fish_asdf_needs_command - set -l cmd (commandline -opc) - if test (count $cmd) -eq 1 - return 0 - end - return 1 -end - -function __fish_asdf_using_command -a current_command - set -l cmd (commandline -opc) - if test (count $cmd) -gt 1 - if test $current_command = $cmd[2] - return 0 - end - end - return 1 -end - -function __fish_asdf_arg_number -a number - set -l cmd (commandline -opc) - test (count $cmd) -eq $number -end - -function __fish_asdf_arg_at -a number - set -l cmd (commandline -opc) - echo $cmd[$number] -end - -function __fish_asdf_list_versions -a plugin - asdf list $plugin 2> /dev/null | sed -e 's/^\s*//' -end - -function __fish_asdf_list_all -a plugin - asdf list-all $plugin 2> /dev/null -end - -function __fish_asdf_plugin_list - asdf plugin-list 2> /dev/null -end - -function __fish_asdf_plugin_list_all - asdf plugin-list-all 2> /dev/null -end - -function __fish_asdf_list_shims - ls $asdf_data_dir/shims -end - -# update -complete -f -c asdf -n '__fish_asdf_needs_command' -a update -d "Update asdf" -complete -f -c asdf -n '__fish_asdf_using_command update; and __fish_asdf_arg_number 2' -l "head" -d "Updates to master HEAD" - -# plugin-add completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a plugin-add -d "Add git repo as plugin" -complete -f -c asdf -n '__fish_asdf_using_command plugin-add; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list_all | grep -v \'*\' | awk \'{ print $1 }\')' -complete -f -c asdf -n '__fish_asdf_using_command plugin-add; and __fish_asdf_arg_number 3' -a '(__fish_asdf_plugin_list_all | grep (__fish_asdf_arg_at 3) | awk \'{ print $2 }\')' -complete -f -c asdf -n '__fish_asdf_using_command plugin-add; and __fish_asdf_arg_number 4' - -# plugin-list completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a plugin-list -d "List installed plugins" - -# plugin-list-all completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a plugin-list-all -d "List all existing plugins" - -# plugin-remove completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a plugin-remove -d "Remove plugin and package versions" -complete -f -c asdf -n '__fish_asdf_using_command plugin-remove; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' - -# plugin-update completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a plugin-update -d "Update plugin" -complete -f -c asdf -n '__fish_asdf_using_command plugin-update; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command plugin-update; and __fish_asdf_arg_number 2' -a --all - -# install completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a install -d "Install a specific version of a package" -complete -f -c asdf -n '__fish_asdf_using_command install; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command install; and __fish_asdf_arg_number 3' -a '(__fish_asdf_list_all (__fish_asdf_arg_at 3))' - -# uninstall completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a uninstall -d "Remove a specific version of a package" -complete -f -c asdf -n '__fish_asdf_using_command uninstall; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command uninstall; and __fish_asdf_arg_number 3' -a '(__fish_asdf_list_versions (__fish_asdf_arg_at 3))' - -# current completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a current -d "Display version set or being used for package" -complete -f -c asdf -n '__fish_asdf_using_command current; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' - -# where completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a where -d "Display install path for an installed version" -complete -f -c asdf -n '__fish_asdf_using_command where; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command where; and __fish_asdf_arg_number 3' -a '(__fish_asdf_list_versions (__fish_asdf_arg_at 3))' - -# which completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a which -d "Display executable path for a command" -complete -f -c asdf -n '__fish_asdf_using_command which; and __fish_asdf_arg_number 2' -a '(__fish_asdf_list_shims)' - -# list completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a list -d "List installed versions of a package" -complete -f -c asdf -n '__fish_asdf_using_command list; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' - -# list-all completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a list-all -d "List all versions of a package" -complete -f -c asdf -n '__fish_asdf_using_command list-all; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' - -# reshim completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a reshim -d "Recreate shims for version of a package" -complete -f -c asdf -n '__fish_asdf_using_command reshim; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command reshim; and __fish_asdf_arg_number 3' -a '(__fish_asdf_list_versions (__fish_asdf_arg_at 3))' - -# local completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a local -d "Set local version for a plugin" -complete -f -c asdf -n '__fish_asdf_using_command local; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command local; and test (count (commandline -opc)) -gt 2' -a '(__fish_asdf_list_versions (__fish_asdf_arg_at 3)) system' - -# global completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a global -d "Set global version for a plugin" -complete -f -c asdf -n '__fish_asdf_using_command global; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command global; and test (count (commandline -opc)) -gt 2' -a '(__fish_asdf_list_versions (__fish_asdf_arg_at 3)) system' - -# shell completion -complete -f -c asdf -n '__fish_asdf_needs_command' -a shell -d "Set version for a plugin in current shell session" -complete -f -c asdf -n '__fish_asdf_using_command shell; and __fish_asdf_arg_number 2' -a '(__fish_asdf_plugin_list)' -complete -f -c asdf -n '__fish_asdf_using_command shell; and test (count (commandline -opc)) -gt 2' -a '(__fish_asdf_list_versions (__fish_asdf_arg_at 3)) system' - -# misc -complete -f -c asdf -n '__fish_asdf_needs_command' -l "help" -d "Displays help" -complete -f -c asdf -n '__fish_asdf_needs_command' -l "version" -d "Displays asdf version" diff --git a/.config/fish/conf.d/asdf.fish b/.config/fish/conf.d/asdf.fish deleted file mode 100644 index aa24984..0000000 --- a/.config/fish/conf.d/asdf.fish +++ /dev/null @@ -1,11 +0,0 @@ -if test -n "$ASDF_DATA_DIR" -a -d "$ASDF_DATA_DIR" - source $ASDF_DATA_DIR/asdf.fish -else if test -f ~/.asdf/asdf.fish - source ~/.asdf/asdf.fish -else if test -f /usr/local/opt/asdf/asdf.fish - source /usr/local/opt/asdf/asdf.fish -else if test -f /opt/homebrew/opt/asdf/asdf.fish - source /opt/homebrew/opt/asdf/asdf.fish -else if test -f /opt/homebrew/opt/asdf/libexec/asdf.fish - source /opt/homebrew/opt/asdf/libexec/asdf.fish -end diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 4495a4b..e633377 100755 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -10,8 +10,6 @@ end set -x GHQ_SELECTOR peco -source (brew --prefix)/opt/asdf/libexec/asdf.fish - set -x PATH (brew --prefix)/opt/gnu-getopt/bin $PATH set -x PATH $HOME/.local/bin $PATH @@ -40,8 +38,6 @@ balias mi "micro" #balias pbcopy "xclip -selection c" #balias pbpaste "xclip -selection c -o" -#source ~/.asdf/asdf.fish - if test -d (brew --prefix)"/share/fish/completions" set -gx fish_complete_path $fish_complete_path (brew --prefix)/share/fish/completions end @@ -50,6 +46,7 @@ if test -d (brew --prefix)"/share/fish/vendor_completions.d" set -gx fish_complete_path $fish_complete_path (brew --prefix)/share/fish/vendor_completions.d end +#fzf --fish | source + # https://starship.rs/ starship init fish | source - diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins index fec675f..5ea7315 100644 --- a/.config/fish/fish_plugins +++ b/.config/fish/fish_plugins @@ -2,4 +2,3 @@ decors/fish-ghq oh-my-fish/plugin-peco oh-my-fish/plugin-balias evanlucas/fish-kubectl-completions -rstacruz/fish-asdf diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 754d3f9..8279f2b 100755 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -5,8 +5,7 @@ SETUVAR _fisher_decors_2F_fish_2D_ghq_files:\x7e/\x2econfig/fish/functions/__ghq SETUVAR _fisher_evanlucas_2F_fish_2D_kubectl_2D_completions_files:\x7e/\x2econfig/fish/completions/kubectl\x2efish SETUVAR _fisher_oh_2D_my_2D_fish_2F_plugin_2D_balias_files:\x7e/\x2econfig/fish/functions/balias\x2efish SETUVAR _fisher_oh_2D_my_2D_fish_2F_plugin_2D_peco_files:\x7e/\x2econfig/fish/functions/peco_kill\x2efish\x1e\x7e/\x2econfig/fish/functions/peco_select_history\x2efish -SETUVAR _fisher_plugins:decors/fish\x2dghq\x1eoh\x2dmy\x2dfish/plugin\x2dpeco\x1eoh\x2dmy\x2dfish/plugin\x2dbalias\x1eevanlucas/fish\x2dkubectl\x2dcompletions\x1erstacruz/fish\x2dasdf -SETUVAR _fisher_rstacruz_2F_fish_2D_asdf_files:\x7e/\x2econfig/fish/conf\x2ed/asdf\x2efish\x1e\x7e/\x2econfig/fish/completions/asdf\x2efish +SETUVAR _fisher_plugins:decors/fish\x2dghq\x1eoh\x2dmy\x2dfish/plugin\x2dpeco\x1eoh\x2dmy\x2dfish/plugin\x2dbalias\x1eevanlucas/fish\x2dkubectl\x2dcompletions SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR fish_color_autosuggestion:555\x1ebrblack SETUVAR fish_color_cancel:\x2dr From ff1bde43189f14e6a151e9da95df324d76ae51fd Mon Sep 17 00:00:00 2001 From: "shinnosuke.suzuki" Date: Tue, 9 Apr 2024 13:14:14 +0900 Subject: [PATCH 2/2] =?UTF-8?q?hyper=20=E3=82=92=20light=20=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hyper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.hyper.js b/.hyper.js index cd3e002..35c9e29 100644 --- a/.hyper.js +++ b/.hyper.js @@ -138,7 +138,7 @@ module.exports = { // `hyperpower` // `@company/project` // `project#1.0.1` - plugins: ["hyper-dracula"], + plugins: ["hyper-one-light"], // in development, you can create a directory under // `~/.hyper_plugins/local/` and include it here // to load it and avoid it being `npm install`ed