From be5b9be3222041695815fbb5fc78e10c9ec3555b Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Sun, 25 Aug 2024 20:53:42 +0100 Subject: [PATCH] Fixed fish shell --- .config/fish/completions/bun.fish | 163 ------------------- .config/fish/conf.d/08_minimal-mistakes.fish | 50 ------ .config/fish/config.fish | 5 + .config/fish/fish_variables | 38 ++++- .config/fish/functions/99_repos.fish | 8 +- 5 files changed, 43 insertions(+), 221 deletions(-) delete mode 100644 .config/fish/completions/bun.fish delete mode 100644 .config/fish/conf.d/08_minimal-mistakes.fish diff --git a/.config/fish/completions/bun.fish b/.config/fish/completions/bun.fish deleted file mode 100644 index 2158790a5..000000000 --- a/.config/fish/completions/bun.fish +++ /dev/null @@ -1,163 +0,0 @@ -# This is terribly complicated -# It's because: -# 1. bun run has to have dynamic completions -# 2. there are global options -# 3. bun {install add remove} gets special options -# 4. I don't know how to write fish completions well -# Contributions very welcome!! - -function __fish__get_bun_bins - string split ' ' (bun getcompletes b) -end - -function __fish__get_bun_scripts - set -lx SHELL bash - set -lx MAX_DESCRIPTION_LEN 40 - string trim (string split '\n' (string split '\t' (bun getcompletes z))) -end - -function __fish__get_bun_packages - if test (commandline -ct) != "" - set -lx SHELL fish - string split ' ' (bun getcompletes a (commandline -ct)) - end -end - -function __history_completions - set -l tokens (commandline --current-process --tokenize) - history --prefix (commandline) | string replace -r \^$tokens[1]\\s\* "" | string replace -r \^$tokens[2]\\s\* "" | string split ' ' -end - -function __fish__get_bun_bun_js_files - string split ' ' (bun getcompletes j) -end - -function bun_fish_is_nth_token --description 'Test if current token is on Nth place' --argument-names n - set -l tokens (commandline -poc) - set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens) - test (count $tokens) -eq "$n" -end - -function __bun_command_count --argument-names n - set -l cmds (commandline -poc) - - test (count cmds) -eq "$n" -end - -function __bun_last_cmd --argument-names n - set -l cmds (commandline -poc) - - test "(cmds[-1])" = "$n" -end - -set -l bun_install_boolean_flags yarn production optional development no-save dry-run force no-cache silent verbose global -set -l bun_install_boolean_flags_descriptions "Write a yarn.lock file (yarn v1)" "Don't install devDependencies" "Add dependency to optionalDependencies" "Add dependency to devDependencies" "Don't install devDependencies" "Don't install anything" "Always request the latest versions from the registry & reinstall all dependenices" "Ignore manifest cache entirely" "Don't output anything" "Excessively verbose logging" "Use global folder" - -set -l bun_builtin_cmds dev create help bun upgrade discord run install remove add init link unlink pm x -set -l bun_builtin_cmds_without_run dev create help bun upgrade discord install remove add init pm x -set -l bun_builtin_cmds_without_bun dev create help upgrade run discord install remove add init pm x -set -l bun_builtin_cmds_without_create dev help bun upgrade discord run install remove add init pm x -set -l bun_builtin_cmds_without_install create dev help bun upgrade discord run remove add init pm x -set -l bun_builtin_cmds_without_remove create dev help bun upgrade discord run install add init pm x -set -l bun_builtin_cmds_without_add create dev help bun upgrade discord run remove install init pm x -set -l bun_builtin_cmds_without_pm create dev help bun upgrade discord run init pm x - -# clear -complete -e -c bun - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '(__fish__get_bun_scripts)' -d 'script' -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_bins)' -d 'package bin' -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_scripts)' -d 'script' -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_run; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from run" -a '(__fish__get_bun_bun_js_files)' -d 'Bun.js' -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'run' -f -d 'Run a script or bin' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'u' -l 'origin' -r -d 'Server URL. Rewrites import paths' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'p' -l 'port' -r -d 'Port number to start server from' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'd' -l 'define' -r -d 'Substitute K:V while parsing, e.g. --define process.env.NODE_ENV:\"development\"' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -s 'e' -l 'external' -r -d 'Exclude module from transpilation (can use * wildcards). ex: -e react' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'use' -r -d 'Use a framework (ex: next)' -complete -c bun \ - -n "not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) install remove add;" --no-files -l 'hot' -r -d 'Enable hot reloading in Bun\'s JavaScript runtime' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __fish_use_subcommand" -a 'dev' -d 'Start dev server' -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'create' -f -d 'Create a new project from a template' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'next' -d 'new Next.js project' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create next react; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from create;" -a 'react' -d 'new React project' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'upgrade' -d 'Upgrade bun to the latest version' -x -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a '--help' -d 'See all commands and flags' -x - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -l "version" -s "v" -a '--version' -d 'Bun\'s version' -x -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_use_subcommand" -a 'discord' -d 'Open bun\'s Discord server' -x - - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_bun; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); __fish_use_subcommand" -a 'bun' -d 'Generate a new bundle' - - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_bun; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from bun" -F -d 'Bundle this' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_create; and not __fish_seen_subcommand_from (__fish__get_bun_bins); and not __fish_seen_subcommand_from (__fish__get_bun_scripts); and __fish_seen_subcommand_from react; or __fish_seen_subcommand_from next" -F -d "Create in directory" - - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'init' -F -d 'Start an empty Bun project' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'install' -f -d 'Install packages from package.json' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'add' -F -d 'Add a package to package.json' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand" -a 'remove' -F -d 'Remove a package from package.json' - -complete -c bun \ - -n "bun_fish_is_nth_token 1; and not __fish_seen_subcommand_from $bun_builtin_cmds; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) and __bun_command_count 1 and __fish_use_subcommand add remove" -F - - -for i in (seq (count $bun_install_boolean_flags)) - complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l "$bun_install_boolean_flags[$i]" -d "$bun_install_boolean_flags_descriptions[$i]" -end - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l 'cwd' -d 'Change working directory' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from install add remove;" -l 'cache-dir' -d 'Choose a cache directory (default: $HOME/.bun/install/cache)' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'Popular' -a '(__fish__get_bun_packages)' - -complete -c bun \ - -n "not __fish_seen_subcommand_from $bun_builtin_cmds_without_pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts); and __fish_seen_subcommand_from add;" -d 'History' -a '(__history_completions)' - -complete -c bun \ - -n "__fish_seen_subcommand_from pm; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts) cache;" -a 'bin ls cache hash hash-print hash-string' -f - -complete -c bun \ - -n "__fish_seen_subcommand_from pm; and __fish_seen_subcommand_from cache; and not __fish_seen_subcommand_from (__fish__get_bun_bins) (__fish__get_bun_scripts);" -a 'rm' -f - -complete -c bun -n "not __fish_seen_subcommand_from $bun_builtin_cmds (__fish__get_bun_bins) (__fish__get_bun_scripts)" -a "$bun_builtin_cmds" -f \ No newline at end of file diff --git a/.config/fish/conf.d/08_minimal-mistakes.fish b/.config/fish/conf.d/08_minimal-mistakes.fish deleted file mode 100644 index 0e290d0d1..000000000 --- a/.config/fish/conf.d/08_minimal-mistakes.fish +++ /dev/null @@ -1,50 +0,0 @@ -# Dracula Color Palette -set -l foreground e5e9f0 -set -l selection 434c5e -set -l comment 81a1c1 -set -l red ff5959 -set -l orange ff9c59 -set -l yellow ffff59 -set -l green 59ff59 -set -l purple 9059ff -set -l cyan 59fff9 -set -l pink ff59f9 - -# Syntax Highlighting Colors -set -gx fish_color_normal $foreground -set -gx fish_color_command $cyan -set -gx fish_color_keyword $pink -set -gx fish_color_quote $yellow -set -gx fish_color_redirection $foreground -set -gx fish_color_end $orange -set -gx fish_color_error $red -set -gx fish_color_param $purple -set -gx fish_color_comment $comment -set -gx fish_color_selection --background=$selection -set -gx fish_color_search_match --background=$selection -set -gx fish_color_operator $green -set -gx fish_color_escape $pink -set -gx fish_color_autosuggestion $comment -set -gx fish_color_cancel $red --reverse -set -gx fish_color_option $orange - -# Default Prompt Colors -set -gx fish_color_cwd $green -set -gx fish_color_host $purple -set -gx fish_color_host_remote $purple -set -gx fish_color_user $cyan - -# Completion Pager Colors -set -gx fish_pager_color_progress $comment -set -gx fish_pager_color_background -set -gx fish_pager_color_prefix $cyan -set -gx fish_pager_color_completion $foreground -set -gx fish_pager_color_description $comment -set -gx fish_pager_color_selected_background --background=$selection -set -gx fish_pager_color_selected_prefix $cyan -set -gx fish_pager_color_selected_completion $foreground -set -gx fish_pager_color_selected_description $comment -set -gx fish_pager_color_secondary_background -set -gx fish_pager_color_secondary_prefix $cyan -set -gx fish_pager_color_secondary_completion $foreground -set -gx fish_pager_color_secondary_description $comment diff --git a/.config/fish/config.fish b/.config/fish/config.fish index a46630366..6e7018c94 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,9 +1,14 @@ export MICRO_TRUECOLOR=1 +for themes in "$HOME/.config/fish/themes/"* + source $themes +end + for plugins in "$HOME/.config/fish/plugins/"* source $plugins end + for functions in "$HOME/.config/fish/functions/"* source $functions end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 01f582322..0069e19e4 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,15 +1,45 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3400 -SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\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 -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejorgebucaran/nvm\x2efish -SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR fish_color_autosuggestion:707A8C +SETUVAR fish_color_cancel:\x2d\x2dreverse +SETUVAR fish_color_command:5CCFE6 +SETUVAR fish_color_comment:5C6773 +SETUVAR fish_color_cwd:73D0FF SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:F29E74 +SETUVAR fish_color_error:FF3333 +SETUVAR fish_color_escape:95E6CB SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:\x1d +SETUVAR fish_color_keyword:\x1d +SETUVAR fish_color_match:F28779 +SETUVAR fish_color_normal:CBCCC6 +SETUVAR fish_color_operator:FFCC66 +SETUVAR fish_color_option:\x1d +SETUVAR fish_color_param:CBCCC6 +SETUVAR fish_color_quote:BAE67E +SETUVAR fish_color_redirection:D4BFFF +SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dFFCC66 +SETUVAR fish_color_selection:\x2d\x2dbackground\x3dFFCC66 SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_background:\x1d +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:B3A06D +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_secondary_background:\x1d +SETUVAR fish_pager_color_secondary_completion:\x1d +SETUVAR fish_pager_color_secondary_description:\x1d +SETUVAR fish_pager_color_secondary_prefix:\x1d +SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dFFCC66 +SETUVAR fish_pager_color_selected_completion:\x1d +SETUVAR fish_pager_color_selected_description:\x1d +SETUVAR fish_pager_color_selected_prefix:\x1d SETUVAR pure_begin_prompt_with_current_directory:true SETUVAR pure_check_for_new_release:false SETUVAR pure_color_at_sign:pure_color_mute diff --git a/.config/fish/functions/99_repos.fish b/.config/fish/functions/99_repos.fish index d335760ab..51dff58ed 100644 --- a/.config/fish/functions/99_repos.fish +++ b/.config/fish/functions/99_repos.fish @@ -6,9 +6,9 @@ function updaterepo switch $confirm case Y y - cd /run/media/wayne/Backup/.gitlabs/ArchLinux.Repo.063240.xyz/scripts/ + cd /run/media/wayne/Backup/.gitlabs/ArchLinux_Repo/scripts/ python mkindex.py --header "arch.linuxrepos.org" ../x86_64 >../x86_64/index.html - cd /run/media/wayne/Backup/.gitlabs/ArchLinux.Repo.063240.xyz/ + cd /run/media/wayne/Backup/.gitlabs/ArchLinux_Repo/ ./x86_64/updaterepo.sh $argv cd $dirprev[1] echoResponce "Arch repo has been updated." @@ -25,10 +25,10 @@ function updatereadme switch $confirm case Y y - cd /run/media/wayne/Backup/.gitlabs/ArchLinux.Repo.063240.xyz/scripts/ + cd /run/media/wayne/Backup/.gitlabs/ArchLinux_Repo/scripts/ python updatereadme.py cd $dirprev[1] - cd /run/media/wayne/Backup/.gitlabs/ArchLinux.Repo.063240.xyz/x86_64/ + cd /run/media/wayne/Backup/.gitlabs/ArchLinux_Repo/x86_64/ python updatereadme.py cd $dirprev[1] echoResponce "Arch readme has been updated."