From 27dc9d54846911cdb0f8ff4776b5b47df8c0632d Mon Sep 17 00:00:00 2001 From: Daniel Fichtinger Date: Wed, 30 Apr 2025 18:00:05 -0400 Subject: [PATCH] AutoYADM commit: 2025-04-30 18:00:05 --- .config/fish/completions/update.fish | 3 -- .config/fish/fish_plugins | 1 - .config/fish/fish_variables | 3 +- .config/fish/functions/update.fish | 75 ---------------------------- 4 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 .config/fish/completions/update.fish delete mode 100644 .config/fish/functions/update.fish diff --git a/.config/fish/completions/update.fish b/.config/fish/completions/update.fish deleted file mode 100644 index 14f12027..00000000 --- a/.config/fish/completions/update.fish +++ /dev/null @@ -1,3 +0,0 @@ -complete -c update -s h -l help -d 'Print help' -complete -c update -s y -l no-confirm -d 'No confirmation' -complete -c update -s o -l one-term -d 'Force single terminal' diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins index daba188e..f195f4a7 100644 --- a/.config/fish/fish_plugins +++ b/.config/fish/fish_plugins @@ -10,6 +10,5 @@ paldepind/projectdo wfxr/forgit jorgebucaran/nvm.fish danhper/fish-ssh-agent -ficcdaf/update.fish ~ficd/fisher ~ficd/jrnl.fish diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 04be7190..82093570 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -7,7 +7,6 @@ SETUVAR __fish_initialized:3800 SETUVAR _fisher__7E_ficd_2F_fisher_files:/home/fic/\x2econfig/fish/functions/fisher\x2efish\x1e/home/fic/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher__7E_ficd_2F_jrnl_2E_fish_files:/home/fic/\x2econfig/fish/functions/jrnl\x2efish\x1e/home/fic/\x2econfig/fish/completions/jrnl\x2efish SETUVAR _fisher_danhper_2F_fish_2D_ssh_2D_agent_files:\x7e/\x2econfig/fish/functions/__ssh_agent_is_started\x2efish\x1e\x7e/\x2econfig/fish/functions/__ssh_agent_start\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fish\x2dssh\x2dagent\x2efish -SETUVAR _fisher_ficcdaf_2F_update_2E_fish_files:\x7e/\x2econfig/fish/functions/update\x2efish\x1e\x7e/\x2econfig/fish/completions/update\x2efish SETUVAR _fisher_franciscolourenco_2F_done_files:\x7e/\x2econfig/fish/conf\x2ed/done\x2efish SETUVAR _fisher_jorgebucaran_2F_autopair_2E_fish_files:\x7e/\x2econfig/fish/functions/_autopair_backspace\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_left\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_right\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_insert_same\x2efish\x1e\x7e/\x2econfig/fish/functions/_autopair_tab\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/autopair\x2efish SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_list\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e\x7e/\x2econfig/fish/functions/nvm\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e\x7e/\x2econfig/fish/completions/nvm\x2efish @@ -18,7 +17,7 @@ SETUVAR _fisher_meaningful_2D_ooo_2F_sponge_files:\x7e/\x2econfig/fish/functions SETUVAR _fisher_nickeb96_2F_puffer_2D_fish_files:\x7e/\x2econfig/fish/functions/_puffer_fish_expand_bang\x2efish\x1e\x7e/\x2econfig/fish/functions/_puffer_fish_expand_dots\x2efish\x1e\x7e/\x2econfig/fish/functions/_puffer_fish_expand_lastarg\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/puffer_fish_key_bindings\x2efish SETUVAR _fisher_paldepind_2F_projectdo_files:\x7e/\x2econfig/fish/functions/projectdo_build\x2efish\x1e\x7e/\x2econfig/fish/functions/projectdo_run\x2efish\x1e\x7e/\x2econfig/fish/functions/projectdo_test\x2efish\x1e\x7e/\x2econfig/fish/functions/projectdo_tool\x2efish\x1e\x7e/\x2econfig/fish/completions/projectdo\x2efish SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish -SETUVAR _fisher_plugins:patrickf1/fzf\x2efish\x1efranciscolourenco/done\x1ejorgebucaran/replay\x2efish\x1ejorgebucaran/spark\x2efish\x1ejoseluisq/gitnow\x402\x2e12\x2e0\x1emeaningful\x2dooo/sponge\x1ejorgebucaran/autopair\x2efish\x1enickeb96/puffer\x2dfish\x1epaldepind/projectdo\x1ewfxr/forgit\x1ejorgebucaran/nvm\x2efish\x1edanhper/fish\x2dssh\x2dagent\x1eficcdaf/update\x2efish\x1e\x7eficd/fisher\x1e\x7eficd/jrnl\x2efish +SETUVAR _fisher_plugins:patrickf1/fzf\x2efish\x1efranciscolourenco/done\x1ejorgebucaran/replay\x2efish\x1ejorgebucaran/spark\x2efish\x1ejoseluisq/gitnow\x402\x2e12\x2e0\x1emeaningful\x2dooo/sponge\x1ejorgebucaran/autopair\x2efish\x1enickeb96/puffer\x2dfish\x1epaldepind/projectdo\x1ewfxr/forgit\x1ejorgebucaran/nvm\x2efish\x1edanhper/fish\x2dssh\x2dagent\x1e\x7eficd/fisher\x1e\x7eficd/jrnl\x2efish SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR _fisher_wfxr_2F_forgit_files:\x7e/\x2econfig/fish/conf\x2ed/bin\x1e\x7e/\x2econfig/fish/conf\x2ed/forgit\x2eplugin\x2efish\x1e\x7e/\x2econfig/fish/completions/_git\x2dforgit\x1e\x7e/\x2econfig/fish/completions/git\x2dforgit\x2ebash\x1e\x7e/\x2econfig/fish/completions/git\x2dforgit\x2efish SETUVAR abbr_path:/home/fic/\x2econfig/fish/conf\x2ed/abbr\x2efish diff --git a/.config/fish/functions/update.fish b/.config/fish/functions/update.fish deleted file mode 100644 index c8eabd54..00000000 --- a/.config/fish/functions/update.fish +++ /dev/null @@ -1,75 +0,0 @@ -function update --description "Update everything" - # autoconfirm - # or force no multiterm - argparse h/help y/no-confirm o/one-term -- $argv - if set -ql _flag_h - printf '%s\n' \ - 'update -- update everything' \ - 'Usage: run `update` to begin' \ - 'Options:' \ - '-y/--no-confirm: Skip update confirmations' \ - '-o/--one-term: Force single terminal mode' \ - '-h/--help: Print this screen' - return 0 - end - # TODO add way for user to configure the update list? - set -g termcmd foot fish -c - set -l std 'cargo install-update -a -gup update -uv tool upgrade --all' - set -l noconfirm 'flatpak update -y -yes | paru -Syu' - set -l confirm 'flatpak update -paru -Syu' - set -g cmds (string split \n -- $std | string trim) - if set -q _flag_y - set --append cmds (string split \n -- $noconfirm | string trim) - sudo -v - else - set --append cmds (string split \n -- $confirm | string trim) - end - echo Commands to be run: - for i in $cmds - echo $i - end - - function execute - argparse i/interactive -- $argv - if set -ql _flag_i - for cmd in $cmds - # max 2 jobs at a time - while test (count (jobs -p)) -ge 2 - sleep 0.5 - end - if string match -q "*paru *" -- "$cmd" - eval $cmd - else - $termcmd $cmd &>/dev/null & - end - end - else - for cmd in $cmds - eval $cmd - end - end - end - - if not set -ql _flag_o && isatty stdin && isatty stdout - while read --nchars 1 -l response --prompt-str="Run on multiple terminals? (y/n)" or return 1 - switch $response - case y Y - execute --interactive - wait - break - case n N - execute - break - case '*' - echo Invalid input! - continue - end - end - else - execute - end -end