From b88d77fb2d0d5028a6f5670695dee6bec129501f Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Fri, 5 Apr 2024 11:57:45 -0400 Subject: [PATCH] ahhh sloppy fish, still needs fixing, esp with the vars --- home-config/bashrc | 4 +- home-config/fish/completions/fisher.fish | 7 + .../completions/fzf_configure_bindings.fish | 8 + home-config/fish/completions/tide.fish | 13 + home-config/fish/conf.d/_tide_init.fish | 44 ++++ home-config/fish/conf.d/fzf.fish | 28 ++ home-config/fish/config.fish | 15 ++ home-config/fish/fish_plugins | 3 + home-config/fish/fish_variables | 198 +++++++++++++++ .../_fzf_configure_bindings_help.fish | 43 ++++ .../fish/functions/_fzf_extract_var_info.fish | 15 ++ .../functions/_fzf_preview_changed_file.fish | 49 ++++ .../fish/functions/_fzf_preview_file.fish | 43 ++++ .../fish/functions/_fzf_report_diff_type.fish | 18 ++ .../fish/functions/_fzf_report_file_type.fish | 6 + .../fish/functions/_fzf_search_directory.fish | 33 +++ .../fish/functions/_fzf_search_git_log.fish | 36 +++ .../functions/_fzf_search_git_status.fish | 41 +++ .../fish/functions/_fzf_search_history.fish | 39 +++ .../fish/functions/_fzf_search_processes.fish | 32 +++ .../fish/functions/_fzf_search_variables.fish | 47 ++++ home-config/fish/functions/_fzf_wrapper.fish | 20 ++ .../fish/functions/_tide_1_line_prompt.fish | 19 ++ .../fish/functions/_tide_2_line_prompt.fish | 31 +++ .../fish/functions/_tide_cache_variables.fish | 17 ++ .../fish/functions/_tide_detect_os.fish | 77 ++++++ .../fish/functions/_tide_find_and_remove.fish | 3 + .../fish/functions/_tide_fish_colorize.fish | 7 + .../fish/functions/_tide_item_aws.fish | 11 + .../fish/functions/_tide_item_character.fish | 17 ++ .../functions/_tide_item_cmd_duration.fish | 12 + .../fish/functions/_tide_item_context.fish | 14 + .../fish/functions/_tide_item_crystal.fish | 6 + .../fish/functions/_tide_item_direnv.fish | 7 + .../fish/functions/_tide_item_distrobox.fish | 4 + .../fish/functions/_tide_item_docker.fish | 5 + .../fish/functions/_tide_item_elixir.fish | 4 + .../fish/functions/_tide_item_gcloud.fish | 8 + .../fish/functions/_tide_item_git.fish | 72 ++++++ home-config/fish/functions/_tide_item_go.fish | 6 + .../fish/functions/_tide_item_java.fish | 6 + .../fish/functions/_tide_item_jobs.fish | 7 + .../fish/functions/_tide_item_kubectl.fish | 4 + .../fish/functions/_tide_item_nix_shell.fish | 3 + .../fish/functions/_tide_item_node.fish | 6 + home-config/fish/functions/_tide_item_os.fish | 3 + .../fish/functions/_tide_item_php.fish | 6 + .../functions/_tide_item_private_mode.fish | 3 + .../fish/functions/_tide_item_pulumi.fish | 19 ++ .../fish/functions/_tide_item_python.fish | 27 ++ .../fish/functions/_tide_item_ruby.fish | 6 + .../fish/functions/_tide_item_rustc.fish | 6 + .../fish/functions/_tide_item_shlvl.fish | 4 + .../fish/functions/_tide_item_status.fish | 15 ++ .../fish/functions/_tide_item_terraform.fish | 5 + .../fish/functions/_tide_item_time.fish | 3 + .../fish/functions/_tide_item_toolbox.fish | 4 + .../fish/functions/_tide_item_vi_mode.fish | 16 ++ .../fish/functions/_tide_item_zig.fish | 6 + .../fish/functions/_tide_parent_dirs.fish | 7 + .../fish/functions/_tide_print_item.fish | 22 ++ home-config/fish/functions/_tide_pwd.fish | 42 +++ .../_tide_remove_unusable_items.fish | 25 ++ .../fish/functions/_tide_sub_bug-report.fish | 73 ++++++ .../fish/functions/_tide_sub_configure.fish | 156 ++++++++++++ .../fish/functions/_tide_sub_reload.fish | 3 + .../fish/functions/fish_mode_prompt.fish | 1 + home-config/fish/functions/fish_prompt.fish | 171 +++++++++++++ home-config/fish/functions/fisher.fish | 240 ++++++++++++++++++ .../functions/fzf_configure_bindings.fish | 46 ++++ home-config/fish/functions/tide.fish | 28 ++ .../tide/configure/choices/all/finish.fish | 46 ++++ .../tide/configure/choices/all/icons.fish | 33 +++ .../configure/choices/all/prompt_colors.fish | 26 ++ .../choices/all/prompt_connection.fish | 31 +++ .../prompt_connection_andor_frame_color.fish | 40 +++ .../configure/choices/all/prompt_spacing.fish | 22 ++ .../tide/configure/choices/all/show_time.fish | 33 +++ .../tide/configure/choices/all/style.fish | 36 +++ .../tide/configure/choices/all/transient.fish | 22 ++ .../choices/classic/classic_prompt_color.fish | 38 +++ .../classic/classic_prompt_separators.fish | 40 +++ .../choices/lean/lean_prompt_height.fish | 26 ++ .../powerline/powerline_prompt_heads.fish | 32 +++ .../powerline/powerline_prompt_style.fish | 51 ++++ .../powerline/powerline_prompt_tails.fish | 40 +++ .../powerline_right_prompt_frame.fish | 20 ++ .../rainbow/rainbow_prompt_separators.fish | 40 +++ .../tide/configure/configs/classic.fish | 116 +++++++++ .../configure/configs/classic_16color.fish | 89 +++++++ .../tide/configure/configs/lean.fish | 116 +++++++++ .../tide/configure/configs/lean_16color.fish | 89 +++++++ .../tide/configure/configs/rainbow.fish | 116 +++++++++ .../configure/configs/rainbow_16color.fish | 93 +++++++ .../functions/_fake_tide_cache_variables.fish | 41 +++ .../functions/_fake_tide_item_character.fish | 8 + .../_fake_tide_item_cmd_duration.fish | 3 + .../functions/_fake_tide_item_git.fish | 3 + .../functions/_fake_tide_item_newline.fish | 5 + .../functions/_fake_tide_item_os.fish | 3 + .../functions/_fake_tide_item_time.fish | 3 + .../functions/_fake_tide_print_item.fish | 22 ++ .../functions/_fake_tide_prompt.fish | 42 +++ .../configure/functions/_fake_tide_pwd.fish | 11 + .../fish/functions/tide/configure/icons.fish | 40 +++ home-config/home-configuration.scm | 6 + modules/ryan-config/base-system.scm | 6 +- modules/ryan-packages/wm.scm | 123 ++++++--- modules/ryan-services/udev.bak | 17 ++ 109 files changed, 3516 insertions(+), 37 deletions(-) create mode 100644 home-config/fish/completions/fisher.fish create mode 100644 home-config/fish/completions/fzf_configure_bindings.fish create mode 100644 home-config/fish/completions/tide.fish create mode 100644 home-config/fish/conf.d/_tide_init.fish create mode 100644 home-config/fish/conf.d/fzf.fish create mode 100644 home-config/fish/config.fish create mode 100644 home-config/fish/fish_plugins create mode 100644 home-config/fish/fish_variables create mode 100644 home-config/fish/functions/_fzf_configure_bindings_help.fish create mode 100644 home-config/fish/functions/_fzf_extract_var_info.fish create mode 100644 home-config/fish/functions/_fzf_preview_changed_file.fish create mode 100644 home-config/fish/functions/_fzf_preview_file.fish create mode 100644 home-config/fish/functions/_fzf_report_diff_type.fish create mode 100644 home-config/fish/functions/_fzf_report_file_type.fish create mode 100644 home-config/fish/functions/_fzf_search_directory.fish create mode 100644 home-config/fish/functions/_fzf_search_git_log.fish create mode 100644 home-config/fish/functions/_fzf_search_git_status.fish create mode 100644 home-config/fish/functions/_fzf_search_history.fish create mode 100644 home-config/fish/functions/_fzf_search_processes.fish create mode 100644 home-config/fish/functions/_fzf_search_variables.fish create mode 100644 home-config/fish/functions/_fzf_wrapper.fish create mode 100644 home-config/fish/functions/_tide_1_line_prompt.fish create mode 100644 home-config/fish/functions/_tide_2_line_prompt.fish create mode 100644 home-config/fish/functions/_tide_cache_variables.fish create mode 100644 home-config/fish/functions/_tide_detect_os.fish create mode 100644 home-config/fish/functions/_tide_find_and_remove.fish create mode 100644 home-config/fish/functions/_tide_fish_colorize.fish create mode 100644 home-config/fish/functions/_tide_item_aws.fish create mode 100644 home-config/fish/functions/_tide_item_character.fish create mode 100644 home-config/fish/functions/_tide_item_cmd_duration.fish create mode 100644 home-config/fish/functions/_tide_item_context.fish create mode 100644 home-config/fish/functions/_tide_item_crystal.fish create mode 100644 home-config/fish/functions/_tide_item_direnv.fish create mode 100644 home-config/fish/functions/_tide_item_distrobox.fish create mode 100644 home-config/fish/functions/_tide_item_docker.fish create mode 100644 home-config/fish/functions/_tide_item_elixir.fish create mode 100644 home-config/fish/functions/_tide_item_gcloud.fish create mode 100644 home-config/fish/functions/_tide_item_git.fish create mode 100644 home-config/fish/functions/_tide_item_go.fish create mode 100644 home-config/fish/functions/_tide_item_java.fish create mode 100644 home-config/fish/functions/_tide_item_jobs.fish create mode 100644 home-config/fish/functions/_tide_item_kubectl.fish create mode 100644 home-config/fish/functions/_tide_item_nix_shell.fish create mode 100644 home-config/fish/functions/_tide_item_node.fish create mode 100644 home-config/fish/functions/_tide_item_os.fish create mode 100644 home-config/fish/functions/_tide_item_php.fish create mode 100644 home-config/fish/functions/_tide_item_private_mode.fish create mode 100644 home-config/fish/functions/_tide_item_pulumi.fish create mode 100644 home-config/fish/functions/_tide_item_python.fish create mode 100644 home-config/fish/functions/_tide_item_ruby.fish create mode 100644 home-config/fish/functions/_tide_item_rustc.fish create mode 100644 home-config/fish/functions/_tide_item_shlvl.fish create mode 100644 home-config/fish/functions/_tide_item_status.fish create mode 100644 home-config/fish/functions/_tide_item_terraform.fish create mode 100644 home-config/fish/functions/_tide_item_time.fish create mode 100644 home-config/fish/functions/_tide_item_toolbox.fish create mode 100644 home-config/fish/functions/_tide_item_vi_mode.fish create mode 100644 home-config/fish/functions/_tide_item_zig.fish create mode 100644 home-config/fish/functions/_tide_parent_dirs.fish create mode 100644 home-config/fish/functions/_tide_print_item.fish create mode 100644 home-config/fish/functions/_tide_pwd.fish create mode 100644 home-config/fish/functions/_tide_remove_unusable_items.fish create mode 100644 home-config/fish/functions/_tide_sub_bug-report.fish create mode 100644 home-config/fish/functions/_tide_sub_configure.fish create mode 100644 home-config/fish/functions/_tide_sub_reload.fish create mode 100644 home-config/fish/functions/fish_mode_prompt.fish create mode 100644 home-config/fish/functions/fish_prompt.fish create mode 100644 home-config/fish/functions/fisher.fish create mode 100644 home-config/fish/functions/fzf_configure_bindings.fish create mode 100644 home-config/fish/functions/tide.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/finish.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/icons.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/prompt_colors.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/prompt_connection.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/prompt_spacing.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/show_time.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/style.fish create mode 100644 home-config/fish/functions/tide/configure/choices/all/transient.fish create mode 100644 home-config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish create mode 100644 home-config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish create mode 100644 home-config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish create mode 100644 home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish create mode 100644 home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish create mode 100644 home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish create mode 100644 home-config/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish create mode 100644 home-config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish create mode 100644 home-config/fish/functions/tide/configure/configs/classic.fish create mode 100644 home-config/fish/functions/tide/configure/configs/classic_16color.fish create mode 100644 home-config/fish/functions/tide/configure/configs/lean.fish create mode 100644 home-config/fish/functions/tide/configure/configs/lean_16color.fish create mode 100644 home-config/fish/functions/tide/configure/configs/rainbow.fish create mode 100644 home-config/fish/functions/tide/configure/configs/rainbow_16color.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish create mode 100644 home-config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish create mode 100644 home-config/fish/functions/tide/configure/icons.fish create mode 100644 modules/ryan-services/udev.bak diff --git a/home-config/bashrc b/home-config/bashrc index 0c61ee6..0fbbb57 100644 --- a/home-config/bashrc +++ b/home-config/bashrc @@ -51,5 +51,5 @@ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/ryan/.l #gpgconf --launch gpg-agent export GPG_TTY=$(tty) -# Setup zoxide for cd command provider -eval "$(zoxide init --cmd cd bash)" +# Replace process with fish +exec fish diff --git a/home-config/fish/completions/fisher.fish b/home-config/fish/completions/fisher.fish new file mode 100644 index 0000000..6d23ce4 --- /dev/null +++ b/home-config/fish/completions/fisher.fish @@ -0,0 +1,7 @@ +complete --command fisher --exclusive --long help --description "Print help" +complete --command fisher --exclusive --long version --description "Print version" +complete --command fisher --exclusive --condition __fish_use_subcommand --arguments install --description "Install plugins" +complete --command fisher --exclusive --condition __fish_use_subcommand --arguments update --description "Update installed plugins" +complete --command fisher --exclusive --condition __fish_use_subcommand --arguments remove --description "Remove installed plugins" +complete --command fisher --exclusive --condition __fish_use_subcommand --arguments list --description "List installed plugins matching regex" +complete --command fisher --exclusive --condition "__fish_seen_subcommand_from update remove" --arguments "(fisher list)" diff --git a/home-config/fish/completions/fzf_configure_bindings.fish b/home-config/fish/completions/fzf_configure_bindings.fish new file mode 100644 index 0000000..b38ef92 --- /dev/null +++ b/home-config/fish/completions/fzf_configure_bindings.fish @@ -0,0 +1,8 @@ +complete fzf_configure_bindings --no-files +complete fzf_configure_bindings --long help --short h --description "Print help" --condition "not __fish_seen_argument --help -h" +complete fzf_configure_bindings --long directory --description "Change the key binding for Search Directory" --condition "not __fish_seen_argument --directory" +complete fzf_configure_bindings --long git_log --description "Change the key binding for Search Git Log" --condition "not __fish_seen_argument --git_log" +complete fzf_configure_bindings --long git_status --description "Change the key binding for Search Git Status" --condition "not __fish_seen_argument --git_status" +complete fzf_configure_bindings --long history --description "Change the key binding for Search History" --condition "not __fish_seen_argument --history" +complete fzf_configure_bindings --long processes --description "Change the key binding for Search Processes" --condition "not __fish_seen_argument --processes" +complete fzf_configure_bindings --long variables --description "Change the key binding for Search Variables" --condition "not __fish_seen_argument --variables" diff --git a/home-config/fish/completions/tide.fish b/home-config/fish/completions/tide.fish new file mode 100644 index 0000000..1ba1960 --- /dev/null +++ b/home-config/fish/completions/tide.fish @@ -0,0 +1,13 @@ +complete tide --no-files + +set -l subcommands bug-report configure reload + +complete tide -x -n __fish_use_subcommand -a bug-report -d "Print info for use in bug reports" +complete tide -x -n __fish_use_subcommand -a configure -d "Run the configuration wizard" +complete tide -x -n __fish_use_subcommand -a reload -d "Reload tide configuration" + +complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s h -l help -d "Print help message" +complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s v -l version -d "Print tide version" + +complete tide -x -n '__fish_seen_subcommand_from bug-report' -l clean -d "Run clean Fish instance and install Tide" +complete tide -x -n '__fish_seen_subcommand_from bug-report' -l verbose -d "Print full Tide configuration" diff --git a/home-config/fish/conf.d/_tide_init.fish b/home-config/fish/conf.d/_tide_init.fish new file mode 100644 index 0000000..b448002 --- /dev/null +++ b/home-config/fish/conf.d/_tide_init.fish @@ -0,0 +1,44 @@ +function _tide_init_install --on-event _tide_init_install + set -U VIRTUAL_ENV_DISABLE_PROMPT true + + source (functions --details _tide_sub_configure) + _load_config lean + _tide_finish + + if status is-interactive + tide bug-report --check || sleep 4 + + if contains ilancosman/tide (string lower $_fisher_plugins) + set_color bryellow + echo "ilancosman/tide is a development branch. Please install from a release tag:" + _tide_fish_colorize "fisher install ilancosman/tide@v6" + sleep 3 + end + + switch (read --prompt-str="Configure tide prompt? [Y/n] " | string lower) + case y ye yes '' + tide configure + case '*' + echo -s \n 'Run ' (_tide_fish_colorize "tide configure") ' to customize your prompt.' + end + end +end + +function _tide_init_update --on-event _tide_init_update + # Warn users who install from main branch + if contains ilancosman/tide (string lower $_fisher_plugins) + set_color bryellow + echo "ilancosman/tide is a development branch. Please install from a release tag:" + _tide_fish_colorize "fisher install ilancosman/tide@v6" + sleep 3 + end + + # Set (disable) the new jobs variable + set -q tide_jobs_number_threshold || set -U tide_jobs_number_threshold 1000 +end + +function _tide_init_uninstall --on-event _tide_init_uninstall + set -e VIRTUAL_ENV_DISABLE_PROMPT + set -e (set -U --names | string match --entire -r '^_?tide') + functions --erase (functions --all | string match --entire -r '^_?tide') +end diff --git a/home-config/fish/conf.d/fzf.fish b/home-config/fish/conf.d/fzf.fish new file mode 100644 index 0000000..8156c11 --- /dev/null +++ b/home-config/fish/conf.d/fzf.fish @@ -0,0 +1,28 @@ +# fzf.fish is only meant to be used in interactive mode. If not in interactive mode and not in CI, skip the config to speed up shell startup +if not status is-interactive && test "$CI" != true + exit +end + +# Because of scoping rules, to capture the shell variables exactly as they are, we must read +# them before even executing _fzf_search_variables. We use psub to store the +# variables' info in temporary files and pass in the filenames as arguments. +# This variable is global so that it can be referenced by fzf_configure_bindings and in tests +set --global _fzf_search_vars_command '_fzf_search_variables (set --show | psub) (set --names | psub)' + + +# Install the default bindings, which are mnemonic and minimally conflict with fish's preset bindings +fzf_configure_bindings + +# Doesn't erase autoloaded _fzf_* functions because they are not easily accessible once key bindings are erased +function _fzf_uninstall --on-event fzf_uninstall + _fzf_uninstall_bindings + + set --erase _fzf_search_vars_command + functions --erase _fzf_uninstall _fzf_migration_message _fzf_uninstall_bindings fzf_configure_bindings + complete --erase fzf_configure_bindings + + set_color cyan + echo "fzf.fish uninstalled." + echo "You may need to manually remove fzf_configure_bindings from your config.fish if you were using custom key bindings." + set_color normal +end diff --git a/home-config/fish/config.fish b/home-config/fish/config.fish new file mode 100644 index 0000000..f300cfe --- /dev/null +++ b/home-config/fish/config.fish @@ -0,0 +1,15 @@ +if status is-interactive + # Commands to run in interactive sessions can go here + alias quit exit + alias cat "bat --paging=never" + alias ds "sudo -E guix system -L ~/.config/guix/modules reconfigure ~/.config/guix/$(prompt_hostname).scm" + alias dh "guix home -L ~/.config/guix/modules reconfigure ~/.config/guix/home-config/home-configuration.scm && home-manager switch" + alias gc "git -C ~/.config/guix add . && git -C ~/.config/guix commit && git -C ~/.config/guix push all" + alias cg "git -C ~/.config/guix pull" + alias cgh "git -C ~/.config/guix pull stationeryh main" + set -gx EDITOR nvim + set -gax XDG_DATA_DIRS ~/.nix-profile/share + fish_add_path ~/.local/bin + fish_add_path ~/.nix-profile/bin + +end diff --git a/home-config/fish/fish_plugins b/home-config/fish/fish_plugins new file mode 100644 index 0000000..09ffc2e --- /dev/null +++ b/home-config/fish/fish_plugins @@ -0,0 +1,3 @@ +jorgebucaran/fisher +ilancosman/tide@v6 +patrickf1/fzf.fish diff --git a/home-config/fish/fish_variables b/home-config/fish/fish_variables new file mode 100644 index 0000000..2218832 --- /dev/null +++ b/home-config/fish/fish_variables @@ -0,0 +1,198 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR VIRTUAL_ENV_DISABLE_PROMPT:true +SETUVAR __fish_initialized:3400 +SETUVAR _fisher_ilancosman_2F_tide_40_v6_files:\x7e/\x2econfig/fish/functions/_tide_1_line_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_2_line_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_cache_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_detect_os\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_find_and_remove\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_fish_colorize\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_aws\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_character\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_cmd_duration\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_context\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_crystal\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_direnv\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_distrobox\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_docker\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_elixir\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_gcloud\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_git\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_go\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_java\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_jobs\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_kubectl\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_nix_shell\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_node\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_os\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_php\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_private_mode\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_pulumi\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_python\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_ruby\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_rustc\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_shlvl\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_terraform\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_time\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_toolbox\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_vi_mode\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_item_zig\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_parent_dirs\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_print_item\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_pwd\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_remove_unusable_items\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_sub_bug\x2dreport\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_sub_configure\x2efish\x1e\x7e/\x2econfig/fish/functions/_tide_sub_reload\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_mode_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/fish_prompt\x2efish\x1e\x7e/\x2econfig/fish/functions/tide\x1e\x7e/\x2econfig/fish/functions/tide\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/_tide_init\x2efish\x1e\x7e/\x2econfig/fish/completions/tide\x2efish +SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\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:jorgebucaran/fisher\x1eilancosman/tide\x40v6\x1epatrickf1/fzf\x2efish +SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR _tide_left_items:pwd\x1egit\x1enewline\x1echaracter +SETUVAR _tide_prompt_22821:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\u276f\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2014\x3a24\x3a33\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_prompt_945:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x40PWD\x40\x20\x1b\x5b38\x3b2\x3b148\x3b148\x3b148m\ue0b1\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x20\x1b\x5b37m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0mmain\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\x20\x2a1\x1b\x5b38\x3b2\x3b255\x3b0\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x1b\x5b38\x3b2\x3b215\x3b175\x3b0m\x20\x214\x1b\x5b38\x3b2\x3b0\x3b175\x3b255m\x20\x3f1\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b0\x1e\x1b\x5b38\x3b2\x3b95\x3b215\x3b0m\u276f\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m\ue0b2\x1b\x5b38\x3b2\x3b95\x3b135\x3b135m\x1b\x5b48\x3b2\x3b48\x3b48\x3b48m\x2014\x3a34\x3a04\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b38\x3b2\x3b48\x3b48\x3b48m +SETUVAR _tide_right_items:status\x1ecmd_duration\x1econtext\x1ejobs\x1enode\x1epython\x1erustc\x1ego\x1enix_shell\x1etime +SETUVAR fish_color_autosuggestion:brblack +SETUVAR fish_color_cancel:\x2dr +SETUVAR fish_color_command:blue +SETUVAR fish_color_comment:red +SETUVAR fish_color_cwd:green +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:green +SETUVAR fish_color_error:brred +SETUVAR fish_color_escape:brcyan +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:normal +SETUVAR fish_color_host_remote:yellow +SETUVAR fish_color_normal:normal +SETUVAR fish_color_operator:brcyan +SETUVAR fish_color_param:cyan +SETUVAR fish_color_quote:yellow +SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold +SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_status:red +SETUVAR fish_color_user:brgreen +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_greeting:\x1d +SETUVAR fish_key_bindings:fish_default_key_bindings +SETUVAR fish_pager_color_completion:normal +SETUVAR fish_pager_color_description:yellow\x1e\x2di +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_selected_background:\x2dr +SETUVAR tide_aws_bg_color:303030 +SETUVAR tide_aws_color:FF9900 +SETUVAR tide_aws_icon:\uf270 +SETUVAR tide_character_color:5FD700 +SETUVAR tide_character_color_failure:FF0000 +SETUVAR tide_character_icon:\u276f +SETUVAR tide_character_vi_icon_default:\u276e +SETUVAR tide_character_vi_icon_replace:\u25b6 +SETUVAR tide_character_vi_icon_visual:V +SETUVAR tide_cmd_duration_bg_color:303030 +SETUVAR tide_cmd_duration_color:87875F +SETUVAR tide_cmd_duration_decimals:0 +SETUVAR tide_cmd_duration_icon:\x1d +SETUVAR tide_cmd_duration_threshold:3000 +SETUVAR tide_context_always_display:false +SETUVAR tide_context_bg_color:303030 +SETUVAR tide_context_color_default:D7AF87 +SETUVAR tide_context_color_root:D7AF00 +SETUVAR tide_context_color_ssh:D7AF87 +SETUVAR tide_context_hostname_parts:1 +SETUVAR tide_crystal_bg_color:303030 +SETUVAR tide_crystal_color:FFFFFF +SETUVAR tide_crystal_icon:\ue62f +SETUVAR tide_direnv_bg_color:303030 +SETUVAR tide_direnv_bg_color_denied:303030 +SETUVAR tide_direnv_color:D7AF00 +SETUVAR tide_direnv_color_denied:FF0000 +SETUVAR tide_direnv_icon:\u25bc +SETUVAR tide_distrobox_bg_color:303030 +SETUVAR tide_distrobox_color:FF00FF +SETUVAR tide_distrobox_icon:\U000f01a7 +SETUVAR tide_docker_bg_color:303030 +SETUVAR tide_docker_color:2496ED +SETUVAR tide_docker_default_contexts:default\x1ecolima +SETUVAR tide_docker_icon:\uf308 +SETUVAR tide_elixir_bg_color:303030 +SETUVAR tide_elixir_color:4E2A8E +SETUVAR tide_elixir_icon:\ue62d +SETUVAR tide_gcloud_bg_color:303030 +SETUVAR tide_gcloud_color:4285F4 +SETUVAR tide_gcloud_icon:\U000f02ad +SETUVAR tide_git_bg_color:303030 +SETUVAR tide_git_bg_color_unstable:303030 +SETUVAR tide_git_bg_color_urgent:303030 +SETUVAR tide_git_color_branch:5FD700 +SETUVAR tide_git_color_conflicted:FF0000 +SETUVAR tide_git_color_dirty:D7AF00 +SETUVAR tide_git_color_operation:FF0000 +SETUVAR tide_git_color_staged:D7AF00 +SETUVAR tide_git_color_stash:5FD700 +SETUVAR tide_git_color_untracked:00AFFF +SETUVAR tide_git_color_upstream:5FD700 +SETUVAR tide_git_icon:\x1d +SETUVAR tide_git_truncation_length:24 +SETUVAR tide_git_truncation_strategy:\x1d +SETUVAR tide_go_bg_color:303030 +SETUVAR tide_go_color:00ACD7 +SETUVAR tide_go_icon:\ue627 +SETUVAR tide_java_bg_color:303030 +SETUVAR tide_java_color:ED8B00 +SETUVAR tide_java_icon:\ue256 +SETUVAR tide_jobs_bg_color:303030 +SETUVAR tide_jobs_color:5FAF00 +SETUVAR tide_jobs_icon:\uf013 +SETUVAR tide_jobs_number_threshold:1000 +SETUVAR tide_kubectl_bg_color:303030 +SETUVAR tide_kubectl_color:326CE5 +SETUVAR tide_kubectl_icon:\U000f10fe +SETUVAR tide_left_prompt_frame_enabled:true +SETUVAR tide_left_prompt_items:pwd\x1egit\x1enewline\x1echaracter +SETUVAR tide_left_prompt_prefix: +SETUVAR tide_left_prompt_separator_diff_color:\ue0b0 +SETUVAR tide_left_prompt_separator_same_color:\ue0b1 +SETUVAR tide_left_prompt_suffix:\ue0b0 +SETUVAR tide_nix_shell_bg_color:303030 +SETUVAR tide_nix_shell_color:7EBAE4 +SETUVAR tide_nix_shell_icon:\uf313 +SETUVAR tide_node_bg_color:303030 +SETUVAR tide_node_color:44883E +SETUVAR tide_node_icon:\ue24f +SETUVAR tide_os_bg_color:303030 +SETUVAR tide_os_color:EEEEEE +SETUVAR tide_os_icon:\uf17c +SETUVAR tide_php_bg_color:303030 +SETUVAR tide_php_color:617CBE +SETUVAR tide_php_icon:\ue608 +SETUVAR tide_private_mode_bg_color:303030 +SETUVAR tide_private_mode_color:FFFFFF +SETUVAR tide_private_mode_icon:\U000f05f9 +SETUVAR tide_prompt_add_newline_before:false +SETUVAR tide_prompt_color_frame_and_connection:6C6C6C +SETUVAR tide_prompt_color_separator_same_color:949494 +SETUVAR tide_prompt_icon_connection:\x20 +SETUVAR tide_prompt_min_cols:34 +SETUVAR tide_prompt_pad_items:true +SETUVAR tide_prompt_transient_enabled:true +SETUVAR tide_pulumi_bg_color:303030 +SETUVAR tide_pulumi_color:F7BF2A +SETUVAR tide_pulumi_icon:\uf1b2 +SETUVAR tide_pwd_bg_color:303030 +SETUVAR tide_pwd_color_anchors:00AFFF +SETUVAR tide_pwd_color_dirs:0087AF +SETUVAR tide_pwd_color_truncated_dirs:8787AF +SETUVAR tide_pwd_icon:\x1d +SETUVAR tide_pwd_icon_home:\x1d +SETUVAR tide_pwd_icon_unwritable:\uf023 +SETUVAR tide_pwd_markers:\x2ebzr\x1e\x2ecitc\x1e\x2egit\x1e\x2ehg\x1e\x2enode\x2dversion\x1e\x2epython\x2dversion\x1e\x2eruby\x2dversion\x1e\x2eshorten_folder_marker\x1e\x2esvn\x1e\x2eterraform\x1eCargo\x2etoml\x1ecomposer\x2ejson\x1eCVS\x1ego\x2emod\x1epackage\x2ejson\x1ebuild\x2ezig +SETUVAR tide_python_bg_color:303030 +SETUVAR tide_python_color:00AFAF +SETUVAR tide_python_icon:\U000f0320 +SETUVAR tide_right_prompt_frame_enabled:false +SETUVAR tide_right_prompt_items:status\x1ecmd_duration\x1econtext\x1ejobs\x1edirenv\x1enode\x1epython\x1erustc\x1ejava\x1ephp\x1epulumi\x1eruby\x1ego\x1egcloud\x1ekubectl\x1edistrobox\x1etoolbox\x1eterraform\x1eaws\x1enix_shell\x1ecrystal\x1eelixir\x1ezig\x1etime +SETUVAR tide_right_prompt_prefix:\ue0b2 +SETUVAR tide_right_prompt_separator_diff_color:\ue0b2 +SETUVAR tide_right_prompt_separator_same_color:\ue0b3 +SETUVAR tide_right_prompt_suffix: +SETUVAR tide_ruby_bg_color:303030 +SETUVAR tide_ruby_color:B31209 +SETUVAR tide_ruby_icon:\ue23e +SETUVAR tide_rustc_bg_color:303030 +SETUVAR tide_rustc_color:F74C00 +SETUVAR tide_rustc_icon:\ue7a8 +SETUVAR tide_shlvl_bg_color:303030 +SETUVAR tide_shlvl_color:d78700 +SETUVAR tide_shlvl_icon:\uf120 +SETUVAR tide_shlvl_threshold:1 +SETUVAR tide_status_bg_color:303030 +SETUVAR tide_status_bg_color_failure:303030 +SETUVAR tide_status_color:5FAF00 +SETUVAR tide_status_color_failure:D70000 +SETUVAR tide_status_icon:\u2714 +SETUVAR tide_status_icon_failure:\u2718 +SETUVAR tide_terraform_bg_color:303030 +SETUVAR tide_terraform_color:844FBA +SETUVAR tide_terraform_icon:\U000f1062 +SETUVAR tide_time_bg_color:303030 +SETUVAR tide_time_color:5F8787 +SETUVAR tide_time_format:\x25T +SETUVAR tide_toolbox_bg_color:303030 +SETUVAR tide_toolbox_color:613583 +SETUVAR tide_toolbox_icon:\ue24f +SETUVAR tide_vi_mode_bg_color_default:303030 +SETUVAR tide_vi_mode_bg_color_insert:303030 +SETUVAR tide_vi_mode_bg_color_replace:303030 +SETUVAR tide_vi_mode_bg_color_visual:303030 +SETUVAR tide_vi_mode_color_default:949494 +SETUVAR tide_vi_mode_color_insert:87AFAF +SETUVAR tide_vi_mode_color_replace:87AF87 +SETUVAR tide_vi_mode_color_visual:FF8700 +SETUVAR tide_vi_mode_icon_default:D +SETUVAR tide_vi_mode_icon_insert:I +SETUVAR tide_vi_mode_icon_replace:R +SETUVAR tide_vi_mode_icon_visual:V +SETUVAR tide_zig_bg_color:303030 +SETUVAR tide_zig_color:F7A41D +SETUVAR tide_zig_icon:\ue6a9 diff --git a/home-config/fish/functions/_fzf_configure_bindings_help.fish b/home-config/fish/functions/_fzf_configure_bindings_help.fish new file mode 100644 index 0000000..ecfe68e --- /dev/null +++ b/home-config/fish/functions/_fzf_configure_bindings_help.fish @@ -0,0 +1,43 @@ +function _fzf_configure_bindings_help --description "Prints the help message for fzf_configure_bindings." + echo "\ +USAGE: + fzf_configure_bindings [--COMMAND=[KEY_SEQUENCE]...] + +DESCRIPTION + fzf_configure_bindings installs key bindings for fzf.fish's commands and erases any bindings it + previously installed. It installs bindings for both default and insert modes. fzf.fish executes + it without options on fish startup to install the out-of-the-box key bindings. + + By default, commands are bound to a mnemonic key sequence, shown below. Each command's binding + can be configured using a namesake corresponding option: + COMMAND | DEFAULT KEY SEQUENCE | CORRESPONDING OPTION + Search Directory | Ctrl+Alt+F (F for file) | --directory + Search Git Log | Ctrl+Alt+L (L for log) | --git_log + Search Git Status | Ctrl+Alt+S (S for status) | --git_status + Search History | Ctrl+R (R for reverse) | --history + Search Processes | Ctrl+Alt+P (P for process) | --processes + Search Variables | Ctrl+V (V for variable) | --variables + Override a command's binding by specifying its corresponding option with the desired key + sequence. Disable a command's binding by specifying its corresponding option with no value. + + Because fzf_configure_bindings erases bindings it previously installed, it can be cleanly + executed multiple times. Once the desired fzf_configure_bindings command has been found, add it + to your config.fish in order to persist the customized bindings. + + In terms of validation, fzf_configure_bindings fails if passed unknown options. It expects an + equals sign between an option's name and value. However, it does not validate key sequences. + + Pass -h or --help to print this help message and exit. + +EXAMPLES + Default bindings but bind Search Directory to Ctrl+F and Search Variables to Ctrl+Alt+V + \$ fzf_configure_bindings --directory=\cf --variables=\e\cv + Default bindings but disable Search History + \$ fzf_configure_bindings --history= + An agglomeration of different options + \$ fzf_configure_bindings --git_status=\cg --history=\ch --variables= --processes= + +SEE Also + To learn more about fish key bindings, see bind(1) and fish_key_reader(1). +" +end diff --git a/home-config/fish/functions/_fzf_extract_var_info.fish b/home-config/fish/functions/_fzf_extract_var_info.fish new file mode 100644 index 0000000..dd4e952 --- /dev/null +++ b/home-config/fish/functions/_fzf_extract_var_info.fish @@ -0,0 +1,15 @@ +# helper function for _fzf_search_variables +function _fzf_extract_var_info --argument-names variable_name set_show_output --description "Extract and reformat lines pertaining to \$variable_name from \$set_show_output." + # Extract only the lines about the variable, all of which begin with either + # $variable_name: ...or... $variable_name[ + string match --regex "^\\\$$variable_name(?::|\[).*" <$set_show_output | + + # Strip the variable name prefix, including ": " for scope info lines + string replace --regex "^\\\$$variable_name(?:: )?" '' | + + # Distill the lines of values, replacing... + # [1]: |value| + # ...with... + # [1] value + string replace --regex ": \|(.*)\|" ' $1' +end diff --git a/home-config/fish/functions/_fzf_preview_changed_file.fish b/home-config/fish/functions/_fzf_preview_changed_file.fish new file mode 100644 index 0000000..78dd561 --- /dev/null +++ b/home-config/fish/functions/_fzf_preview_changed_file.fish @@ -0,0 +1,49 @@ +# helper for _fzf_search_git_status +# arg should be a line from git status --short, e.g. +# MM functions/_fzf_preview_changed_file.fish +# D README.md +# R LICENSE -> "New License" +function _fzf_preview_changed_file --argument-names path_status --description "Show the git diff of the given file." + # remove quotes because they'll be interpreted literally by git diff + # no need to requote when referencing $path because fish does not perform word splitting + # https://fishshell.com/docs/current/fish_for_bash_users.html + set -f path (string unescape (string sub --start 4 $path_status)) + # first letter of short format shows index, second letter shows working tree + # https://git-scm.com/docs/git-status/2.35.0#_short_format + set -f index_status (string sub --length 1 $path_status) + set -f working_tree_status (string sub --start 2 --length 1 $path_status) + + set -f diff_opts --color=always + + if test $index_status = '?' + _fzf_report_diff_type Untracked + _fzf_preview_file $path + else if contains {$index_status}$working_tree_status DD AU UD UA DU AA UU + # Unmerged statuses taken directly from git status help's short format table + # Unmerged statuses are mutually exclusive with other statuses, so if we see + # these, then safe to assume the path is unmerged + _fzf_report_diff_type Unmerged + git diff $diff_opts -- $path + else + if test $index_status != ' ' + _fzf_report_diff_type Staged + + # renames are only detected in the index, never working tree, so only need to test for it here + # https://stackoverflow.com/questions/73954214 + if test $index_status = R + # diff the post-rename path with the original path, otherwise the diff will show the entire file as being added + set -f orig_and_new_path (string split --max 1 -- ' -> ' $path) + git diff --staged $diff_opts -- $orig_and_new_path[1] $orig_and_new_path[2] + # path currently has the form of "original -> current", so we need to correct it before it's used below + set path $orig_and_new_path[2] + else + git diff --staged $diff_opts -- $path + end + end + + if test $working_tree_status != ' ' + _fzf_report_diff_type Unstaged + git diff $diff_opts -- $path + end + end +end diff --git a/home-config/fish/functions/_fzf_preview_file.fish b/home-config/fish/functions/_fzf_preview_file.fish new file mode 100644 index 0000000..c926475 --- /dev/null +++ b/home-config/fish/functions/_fzf_preview_file.fish @@ -0,0 +1,43 @@ +# helper function for _fzf_search_directory and _fzf_search_git_status +function _fzf_preview_file --description "Print a preview for the given file based on its file type." + # because there's no way to guarantee that _fzf_search_directory passes the path to _fzf_preview_file + # as one argument, we collect all the arguments into one single variable and treat that as the path + set -f file_path $argv + + if test -L "$file_path" # symlink + # notify user and recurse on the target of the symlink, which can be any of these file types + set -l target_path (realpath "$file_path") + + set_color yellow + echo "'$file_path' is a symlink to '$target_path'." + set_color normal + + _fzf_preview_file "$target_path" + else if test -f "$file_path" # regular file + if set --query fzf_preview_file_cmd + # need to escape quotes to make sure eval receives file_path as a single arg + eval "$fzf_preview_file_cmd '$file_path'" + else + bat --style=numbers --color=always "$file_path" + end + else if test -d "$file_path" # directory + if set --query fzf_preview_dir_cmd + # see above + eval "$fzf_preview_dir_cmd '$file_path'" + else + # -A list hidden files as well, except for . and .. + # -F helps classify files by appending symbols after the file name + command ls -A -F "$file_path" + end + else if test -c "$file_path" + _fzf_report_file_type "$file_path" "character device file" + else if test -b "$file_path" + _fzf_report_file_type "$file_path" "block device file" + else if test -S "$file_path" + _fzf_report_file_type "$file_path" socket + else if test -p "$file_path" + _fzf_report_file_type "$file_path" "named pipe" + else + echo "$file_path doesn't exist." >&2 + end +end diff --git a/home-config/fish/functions/_fzf_report_diff_type.fish b/home-config/fish/functions/_fzf_report_diff_type.fish new file mode 100644 index 0000000..cc26fb3 --- /dev/null +++ b/home-config/fish/functions/_fzf_report_diff_type.fish @@ -0,0 +1,18 @@ +# helper for _fzf_preview_changed_file +# prints out something like +# ╭────────╮ +# │ Staged │ +# ╰────────╯ +function _fzf_report_diff_type --argument-names diff_type --description "Print a distinct colored header meant to preface a git patch." + # number of "-" to draw is the length of the string to box + 2 for padding + set -f repeat_count (math 2 + (string length $diff_type)) + set -f line (string repeat --count $repeat_count ─) + set -f top_border ╭$line╮ + set -f btm_border ╰$line╯ + + set_color yellow + echo $top_border + echo "│ $diff_type │" + echo $btm_border + set_color normal +end diff --git a/home-config/fish/functions/_fzf_report_file_type.fish b/home-config/fish/functions/_fzf_report_file_type.fish new file mode 100644 index 0000000..49e02e1 --- /dev/null +++ b/home-config/fish/functions/_fzf_report_file_type.fish @@ -0,0 +1,6 @@ +# helper function for _fzf_preview_file +function _fzf_report_file_type --argument-names file_path file_type --description "Explain the file type for a file." + set_color red + echo "Cannot preview '$file_path': it is a $file_type." + set_color normal +end diff --git a/home-config/fish/functions/_fzf_search_directory.fish b/home-config/fish/functions/_fzf_search_directory.fish new file mode 100644 index 0000000..4541eec --- /dev/null +++ b/home-config/fish/functions/_fzf_search_directory.fish @@ -0,0 +1,33 @@ +function _fzf_search_directory --description "Search the current directory. Replace the current token with the selected file paths." + # Directly use fd binary to avoid output buffering delay caused by a fd alias, if any. + # Debian-based distros install fd as fdfind and the fd package is something else, so + # check for fdfind first. Fall back to "fd" for a clear error message. + set -f fd_cmd (command -v fdfind || command -v fd || echo "fd") + set -f --append fd_cmd --color=always $fzf_fd_opts + + set -f fzf_arguments --multi --ansi $fzf_directory_opts + set -f token (commandline --current-token) + # expand any variables or leading tilde (~) in the token + set -f expanded_token (eval echo -- $token) + # unescape token because it's already quoted so backslashes will mess up the path + set -f unescaped_exp_token (string unescape -- $expanded_token) + + # If the current token is a directory and has a trailing slash, + # then use it as fd's base directory. + if string match --quiet -- "*/" $unescaped_exp_token && test -d "$unescaped_exp_token" + set --append fd_cmd --base-directory=$unescaped_exp_token + # use the directory name as fzf's prompt to indicate the search is limited to that directory + set --prepend fzf_arguments --prompt="Directory $unescaped_exp_token> " --preview="_fzf_preview_file $expanded_token{}" + set -f file_paths_selected $unescaped_exp_token($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) + else + set --prepend fzf_arguments --prompt="Directory> " --query="$unescaped_exp_token" --preview='_fzf_preview_file {}' + set -f file_paths_selected ($fd_cmd 2>/dev/null | _fzf_wrapper $fzf_arguments) + end + + + if test $status -eq 0 + commandline --current-token --replace -- (string escape -- $file_paths_selected | string join ' ') + end + + commandline --function repaint +end diff --git a/home-config/fish/functions/_fzf_search_git_log.fish b/home-config/fish/functions/_fzf_search_git_log.fish new file mode 100644 index 0000000..aa54724 --- /dev/null +++ b/home-config/fish/functions/_fzf_search_git_log.fish @@ -0,0 +1,36 @@ +function _fzf_search_git_log --description "Search the output of git log and preview commits. Replace the current token with the selected commit hash." + if not git rev-parse --git-dir >/dev/null 2>&1 + echo '_fzf_search_git_log: Not in a git repository.' >&2 + else + if not set --query fzf_git_log_format + # %h gives you the abbreviated commit hash, which is useful for saving screen space, but we will have to expand it later below + set -f fzf_git_log_format '%C(bold blue)%h%C(reset) - %C(cyan)%ad%C(reset) %C(yellow)%d%C(reset) %C(normal)%s%C(reset) %C(dim normal)[%an]%C(reset)' + end + + set -f preview_cmd 'git show --color=always --stat --patch {1}' + if set --query fzf_diff_highlighter + set preview_cmd "$preview_cmd | $fzf_diff_highlighter" + end + + set -f selected_log_lines ( + git log --no-show-signature --color=always --format=format:$fzf_git_log_format --date=short | \ + _fzf_wrapper --ansi \ + --multi \ + --scheme=history \ + --prompt="Git Log> " \ + --preview=$preview_cmd \ + --query=(commandline --current-token) \ + $fzf_git_log_opts + ) + if test $status -eq 0 + for line in $selected_log_lines + set -f abbreviated_commit_hash (string split --field 1 " " $line) + set -f full_commit_hash (git rev-parse $abbreviated_commit_hash) + set -f --append commit_hashes $full_commit_hash + end + commandline --current-token --replace (string join ' ' $commit_hashes) + end + end + + commandline --function repaint +end diff --git a/home-config/fish/functions/_fzf_search_git_status.fish b/home-config/fish/functions/_fzf_search_git_status.fish new file mode 100644 index 0000000..358f88c --- /dev/null +++ b/home-config/fish/functions/_fzf_search_git_status.fish @@ -0,0 +1,41 @@ +function _fzf_search_git_status --description "Search the output of git status. Replace the current token with the selected file paths." + if not git rev-parse --git-dir >/dev/null 2>&1 + echo '_fzf_search_git_status: Not in a git repository.' >&2 + else + set -f preview_cmd '_fzf_preview_changed_file {}' + if set --query fzf_diff_highlighter + set preview_cmd "$preview_cmd | $fzf_diff_highlighter" + end + + set -f selected_paths ( + # Pass configuration color.status=always to force status to use colors even though output is sent to a pipe + git -c color.status=always status --short | + _fzf_wrapper --ansi \ + --multi \ + --prompt="Git Status> " \ + --query=(commandline --current-token) \ + --preview=$preview_cmd \ + --nth="2.." \ + $fzf_git_status_opts + ) + if test $status -eq 0 + # git status --short automatically escapes the paths of most files for us so not going to bother trying to handle + # the few edges cases of weird file names that should be extremely rare (e.g. "this;needs;escaping") + set -f cleaned_paths + + for path in $selected_paths + if test (string sub --length 1 $path) = R + # path has been renamed and looks like "R LICENSE -> LICENSE.md" + # extract the path to use from after the arrow + set --append cleaned_paths (string split -- "-> " $path)[-1] + else + set --append cleaned_paths (string sub --start=4 $path) + end + end + + commandline --current-token --replace -- (string join ' ' $cleaned_paths) + end + end + + commandline --function repaint +end diff --git a/home-config/fish/functions/_fzf_search_history.fish b/home-config/fish/functions/_fzf_search_history.fish new file mode 100644 index 0000000..cafbce9 --- /dev/null +++ b/home-config/fish/functions/_fzf_search_history.fish @@ -0,0 +1,39 @@ +function _fzf_search_history --description "Search command history. Replace the command line with the selected command." + # history merge incorporates history changes from other fish sessions + # it errors out if called in private mode + if test -z "$fish_private_mode" + builtin history merge + end + + if not set --query fzf_history_time_format + # Reference https://devhints.io/strftime to understand strftime format symbols + set -f fzf_history_time_format "%m-%d %H:%M:%S" + end + + # Delinate time from command in history entries using the vertical box drawing char (U+2502). + # Then, to get raw command from history entries, delete everything up to it. The ? on regex is + # necessary to make regex non-greedy so it won't match into commands containing the char. + set -f time_prefix_regex '^.*? │ ' + # Delinate commands throughout pipeline using null rather than newlines because commands can be multi-line + set -f commands_selected ( + builtin history --null --show-time="$fzf_history_time_format │ " | + _fzf_wrapper --read0 \ + --print0 \ + --multi \ + --scheme=history \ + --prompt="History> " \ + --query=(commandline) \ + --preview="string replace --regex '$time_prefix_regex' '' -- {} | fish_indent --ansi" \ + --preview-window="bottom:3:wrap" \ + $fzf_history_opts | + string split0 | + # remove timestamps from commands selected + string replace --regex $time_prefix_regex '' + ) + + if test $status -eq 0 + commandline --replace -- $commands_selected + end + + commandline --function repaint +end diff --git a/home-config/fish/functions/_fzf_search_processes.fish b/home-config/fish/functions/_fzf_search_processes.fish new file mode 100644 index 0000000..133a880 --- /dev/null +++ b/home-config/fish/functions/_fzf_search_processes.fish @@ -0,0 +1,32 @@ +function _fzf_search_processes --description "Search all running processes. Replace the current token with the pid of the selected process." + # Directly use ps command because it is often aliased to a different command entirely + # or with options that dirty the search results and preview output + set -f ps_cmd (command -v ps || echo "ps") + # use all caps to be consistent with ps default format + # snake_case because ps doesn't seem to allow spaces in the field names + set -f ps_preview_fmt (string join ',' 'pid' 'ppid=PARENT' 'user' '%cpu' 'rss=RSS_IN_KB' 'start=START_TIME' 'command') + set -f processes_selected ( + $ps_cmd -A -opid,command | \ + _fzf_wrapper --multi \ + --prompt="Processes> " \ + --query (commandline --current-token) \ + --ansi \ + # first line outputted by ps is a header, so we need to mark it as so + --header-lines=1 \ + # ps uses exit code 1 if the process was not found, in which case show an message explaining so + --preview="$ps_cmd -o '$ps_preview_fmt' -p {1} || echo 'Cannot preview {1} because it exited.'" \ + --preview-window="bottom:4:wrap" \ + $fzf_processes_opts + ) + + if test $status -eq 0 + for process in $processes_selected + set -f --append pids_selected (string split --no-empty --field=1 -- " " $process) + end + + # string join to replace the newlines outputted by string split with spaces + commandline --current-token --replace -- (string join ' ' $pids_selected) + end + + commandline --function repaint +end diff --git a/home-config/fish/functions/_fzf_search_variables.fish b/home-config/fish/functions/_fzf_search_variables.fish new file mode 100644 index 0000000..52a7c70 --- /dev/null +++ b/home-config/fish/functions/_fzf_search_variables.fish @@ -0,0 +1,47 @@ +# This function expects the following two arguments: +# argument 1 = output of (set --show | psub), i.e. a file with the scope info and values of all variables +# argument 2 = output of (set --names | psub), i.e. a file with all variable names +function _fzf_search_variables --argument-names set_show_output set_names_output --description "Search and preview shell variables. Replace the current token with the selected variable." + if test -z "$set_names_output" + printf '%s\n' '_fzf_search_variables requires 2 arguments.' >&2 + + commandline --function repaint + return 22 # 22 means invalid argument in POSIX + end + + # Exclude the history variable from being piped into fzf because + # 1. it's not included in $set_names_output + # 2. it tends to be a very large value => increases computation time + # 3._fzf_search_history is a much better way to examine history anyway + set -f all_variable_names (string match --invert history <$set_names_output) + + set -f current_token (commandline --current-token) + # Use the current token to pre-populate fzf's query. If the current token begins + # with a $, remove it from the query so that it will better match the variable names + set -f cleaned_curr_token (string replace -- '$' '' $current_token) + + set -f variable_names_selected ( + printf '%s\n' $all_variable_names | + _fzf_wrapper --preview "_fzf_extract_var_info {} $set_show_output" \ + --prompt="Variables> " \ + --preview-window="wrap" \ + --multi \ + --query=$cleaned_curr_token \ + $fzf_variables_opts + ) + + if test $status -eq 0 + # If the current token begins with a $, do not overwrite the $ when + # replacing the current token with the selected variable. + # Uses brace expansion to prepend $ to each variable name. + commandline --current-token --replace ( + if string match --quiet -- '$*' $current_token + string join " " \${$variable_names_selected} + else + string join " " $variable_names_selected + end + ) + end + + commandline --function repaint +end diff --git a/home-config/fish/functions/_fzf_wrapper.fish b/home-config/fish/functions/_fzf_wrapper.fish new file mode 100644 index 0000000..45556ce --- /dev/null +++ b/home-config/fish/functions/_fzf_wrapper.fish @@ -0,0 +1,20 @@ +function _fzf_wrapper --description "Prepares some environment variables before executing fzf." + # Make sure fzf uses fish to execute preview commands, some of which + # are autoloaded fish functions so don't exist in other shells. + # Use --function so that it doesn't clobber SHELL outside this function. + set -f --export SHELL (command --search fish) + + # If FZF_DEFAULT_OPTS is not set, then set some sane defaults. + # See https://github.com/junegunn/fzf#environment-variables + if not set --query FZF_DEFAULT_OPTS + # cycle allows jumping between the first and last results, making scrolling faster + # layout=reverse lists results top to bottom, mimicking the familiar layouts of git log, history, and env + # border shows where the fzf window begins and ends + # height=90% leaves space to see the current command and some scrollback, maintaining context of work + # preview-window=wrap wraps long lines in the preview window, making reading easier + # marker=* makes the multi-select marker more distinguishable from the pointer (since both default to >) + set --export FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"' + end + + fzf $argv +end diff --git a/home-config/fish/functions/_tide_1_line_prompt.fish b/home-config/fish/functions/_tide_1_line_prompt.fish new file mode 100644 index 0000000..5772223 --- /dev/null +++ b/home-config/fish/functions/_tide_1_line_prompt.fish @@ -0,0 +1,19 @@ +function _tide_1_line_prompt + set -g add_prefix + _tide_side=left for item in $_tide_left_items + _tide_item_$item + end + set_color $prev_bg_color -b normal + echo $tide_left_prompt_suffix + + set -g add_prefix + _tide_side=right for item in $_tide_right_items + _tide_item_$item + end + set_color $prev_bg_color -b normal + echo $tide_right_prompt_suffix +end + +function _tide_item_pwd + _tide_print_item pwd @PWD@ +end diff --git a/home-config/fish/functions/_tide_2_line_prompt.fish b/home-config/fish/functions/_tide_2_line_prompt.fish new file mode 100644 index 0000000..e9017af --- /dev/null +++ b/home-config/fish/functions/_tide_2_line_prompt.fish @@ -0,0 +1,31 @@ +function _tide_2_line_prompt + set -g add_prefix + _tide_side=left for item in $_tide_left_items + _tide_item_$item + end + if not set -e add_prefix + set_color $prev_bg_color -b normal + echo $tide_left_prompt_suffix + end + + echo + + set -g add_prefix + _tide_side=right for item in $_tide_right_items + _tide_item_$item + end + if not set -e add_prefix + set_color $prev_bg_color -b normal + echo $tide_right_prompt_suffix + end +end + +function _tide_item_pwd + _tide_print_item pwd @PWD@ +end + +function _tide_item_newline + set_color $prev_bg_color -b normal + v=tide_"$_tide_side"_prompt_suffix echo $$v + set -g add_prefix +end diff --git a/home-config/fish/functions/_tide_cache_variables.fish b/home-config/fish/functions/_tide_cache_variables.fish new file mode 100644 index 0000000..31e3850 --- /dev/null +++ b/home-config/fish/functions/_tide_cache_variables.fish @@ -0,0 +1,17 @@ +function _tide_cache_variables + # Same-color-separator color + set_color $tide_prompt_color_separator_same_color | read -gx _tide_color_separator_same_color + + # git + contains git $_tide_left_items $_tide_right_items && set_color $tide_git_color_branch | read -gx _tide_location_color + + # private_mode + if contains private_mode $_tide_left_items $_tide_right_items && test -n "$fish_private_mode" + set -gx _tide_private_mode + else + set -e _tide_private_mode + end + + # item padding + test "$tide_prompt_pad_items" = true && set -gx _tide_pad ' ' || set -e _tide_pad +end diff --git a/home-config/fish/functions/_tide_detect_os.fish b/home-config/fish/functions/_tide_detect_os.fish new file mode 100644 index 0000000..cf38388 --- /dev/null +++ b/home-config/fish/functions/_tide_detect_os.fish @@ -0,0 +1,77 @@ +# Outputs icon, color, bg_color +function _tide_detect_os + set -lx defaultColor 080808 CED7CF + switch (uname | string lower) + case darwin + printf %s\n  D6D6D6 333333 # from apple.com header + case freebsd openbsd dragonfly + printf %s\n  FFFFFF AB2B28 # https://freebsdfoundation.org/about-us/about-the-foundation/project/ + case 'cygwin*' 'mingw*_nt*' 'msys_nt*' + printf %s\n  FFFFFF 00CCFF # https://answers.microsoft.com/en-us/windows/forum/all/what-is-the-official-windows-8-blue-rgb-or-hex/fd57144b-f69b-42d8-8c21-6ca911646e44 + case linux + if test (uname -o) = Android + echo ﲎ # This character is evil and messes up code display, so it's put on its own line + # https://developer.android.com/distribute/marketing-tools/brand-guidelines + printf %s\n 3DDC84 3C3F41 # fg is from above link, bg is from Android Studio default dark theme + else + _tide_detect_os_linux_cases /etc/os-release ID || + _tide_detect_os_linux_cases /etc/os-release ID_LIKE || + _tide_detect_os_linux_cases /etc/lsb-release DISTRIB_ID || + printf %s\n  $defaultColor + end + case '*' + echo -ns '?' + end +end + +function _tide_detect_os_linux_cases -a file key + test -e $file || return + set -l split_file (string split '=' <$file) + set -l key_index (contains --index $key $split_file) || return + set -l value (string trim --chars='"' $split_file[(math $key_index + 1)]) + + # Anything which would have pure white background has been changed to D4D4D4 + # It was just too bright otherwise + switch (string lower $value) + case alpine + printf %s\n  FFFFFF 0D597F # from alpine logo + case arch + printf %s\n  1793D1 4D4D4D # from arch wiki header + case centos + printf %s\n  000000 D4D4D4 # https://wiki.centos.org/ArtWork/Brand/Logo, monochromatic + case debian + printf %s\n  C70036 D4D4D4 # from debian logo https://www.debian.org/logos/openlogo-nd-100.png + case devuan + printf %s\n  $defaultColor # logo is monochromatic + case elementary + printf %s\n  000000 D4D4D4 # https://elementary.io/brand, encouraged to be monochromatic + case fedora + printf %s\n  FFFFFF 294172 # from logo https://fedoraproject.org/w/uploads/2/2d/Logo_fedoralogo.png + case gentoo + printf %s\n  FFFFFF 54487A # https://wiki.gentoo.org/wiki/Project:Artwork/Colors + case mageia + printf %s\n  FFFFFF 262F45 # https://wiki.mageia.org/en/Artwork_guidelines + case manjaro + printf %s\n  FFFFFF 35BF5C # from https://gitlab.manjaro.org/artwork/branding/logo/-/blob/master/logo.svg + case mint linuxmint + printf %s\n  FFFFFF 69B53F # extracted from https://linuxmint.com/web/img/favicon.ico + case nixos + printf %s\n  FFFFFF 5277C3 # https://github.com/NixOS/nixos-artwork/tree/master/logo + case opensuse-leap opensuse-tumbleweed opensuse-microos + printf %s\n  73BA25 173f4f # https://en.opensuse.org/openSUSE:Artwork_brand + case raspbian + printf %s\n  FFFFFF A22846 # https://static.raspberrypi.org/files/Raspberry_Pi_Visual_Guidelines_2020.pdf + case rhel + printf %s\n  EE0000 000000 # https://www.redhat.com/en/about/brand/standards/color + case sabayon + printf %s\n  $defaultColor # Can't find colors, and they are rebranding anyway + case slackware + printf %s\n  $defaultColor # Doesn't really have a logo, and the colors are too close to PWD blue anyway + case ubuntu + printf %s\n  E95420 D4D4D4 # https://design.ubuntu.com/brand/ + case void + printf %s\n  FFFFFF 478061 # from https://alpha.de.repo.voidlinux.org/logos/void.svg + case '*' + return 1 + end +end diff --git a/home-config/fish/functions/_tide_find_and_remove.fish b/home-config/fish/functions/_tide_find_and_remove.fish new file mode 100644 index 0000000..29f2180 --- /dev/null +++ b/home-config/fish/functions/_tide_find_and_remove.fish @@ -0,0 +1,3 @@ +function _tide_find_and_remove -a name list --no-scope-shadowing + contains --index $name $$list | read -l index && set -e "$list"[$index] +end diff --git a/home-config/fish/functions/_tide_fish_colorize.fish b/home-config/fish/functions/_tide_fish_colorize.fish new file mode 100644 index 0000000..f79b188 --- /dev/null +++ b/home-config/fish/functions/_tide_fish_colorize.fish @@ -0,0 +1,7 @@ +function _tide_fish_colorize + if command -q fish_indent + echo -ns "$argv" | fish_indent --ansi + else + echo -ns "$argv" + end +end diff --git a/home-config/fish/functions/_tide_item_aws.fish b/home-config/fish/functions/_tide_item_aws.fish new file mode 100644 index 0000000..7cb6338 --- /dev/null +++ b/home-config/fish/functions/_tide_item_aws.fish @@ -0,0 +1,11 @@ +function _tide_item_aws + # AWS_PROFILE overrides AWS_DEFAULT_PROFILE, AWS_REGION overrides AWS_DEFAULT_REGION + set -q AWS_PROFILE && set -l AWS_DEFAULT_PROFILE $AWS_PROFILE + set -q AWS_REGION && set -l AWS_DEFAULT_REGION $AWS_REGION + + if test -n "$AWS_DEFAULT_PROFILE" && test -n "$AWS_DEFAULT_REGION" + _tide_print_item aws $tide_aws_icon' ' "$AWS_DEFAULT_PROFILE/$AWS_DEFAULT_REGION" + else if test -n "$AWS_DEFAULT_PROFILE$AWS_DEFAULT_REGION" + _tide_print_item aws $tide_aws_icon' ' "$AWS_DEFAULT_PROFILE$AWS_DEFAULT_REGION" + end +end diff --git a/home-config/fish/functions/_tide_item_character.fish b/home-config/fish/functions/_tide_item_character.fish new file mode 100644 index 0000000..10bb324 --- /dev/null +++ b/home-config/fish/functions/_tide_item_character.fish @@ -0,0 +1,17 @@ +function _tide_item_character + test $_tide_status = 0 && set_color $tide_character_color || set_color $tide_character_color_failure + + set -q add_prefix || echo -ns ' ' + + test "$fish_key_bindings" = fish_default_key_bindings && echo -ns $tide_character_icon || + switch $fish_bind_mode + case insert + echo -ns $tide_character_icon + case default + echo -ns $tide_character_vi_icon_default + case replace replace_one + echo -ns $tide_character_vi_icon_replace + case visual + echo -ns $tide_character_vi_icon_visual + end +end diff --git a/home-config/fish/functions/_tide_item_cmd_duration.fish b/home-config/fish/functions/_tide_item_cmd_duration.fish new file mode 100644 index 0000000..bc48bac --- /dev/null +++ b/home-config/fish/functions/_tide_item_cmd_duration.fish @@ -0,0 +1,12 @@ +function _tide_item_cmd_duration + test $CMD_DURATION -gt $tide_cmd_duration_threshold && t=( + math -s0 "$CMD_DURATION/3600000" # Hours + math -s0 "$CMD_DURATION/60000"%60 # Minutes + math -s$tide_cmd_duration_decimals "$CMD_DURATION/1000"%60) if test $t[1] != 0 + _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[1]h $t[2]m $t[3]s" + else if test $t[2] != 0 + _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[2]m $t[3]s" + else + _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[3]s" + end +end diff --git a/home-config/fish/functions/_tide_item_context.fish b/home-config/fish/functions/_tide_item_context.fish new file mode 100644 index 0000000..cbdf420 --- /dev/null +++ b/home-config/fish/functions/_tide_item_context.fish @@ -0,0 +1,14 @@ +function _tide_item_context + if set -q SSH_TTY + set -fx tide_context_color $tide_context_color_ssh + else if test "$EUID" = 0 + set -fx tide_context_color $tide_context_color_root + else if test "$tide_context_always_display" = true + set -fx tide_context_color $tide_context_color_default + else + return + end + + string match -qr "^(?(\.?[^\.]*){0,$tide_context_hostname_parts})" @$hostname + _tide_print_item context $USER$h +end diff --git a/home-config/fish/functions/_tide_item_crystal.fish b/home-config/fish/functions/_tide_item_crystal.fish new file mode 100644 index 0000000..620dde4 --- /dev/null +++ b/home-config/fish/functions/_tide_item_crystal.fish @@ -0,0 +1,6 @@ +function _tide_item_crystal + if path is $_tide_parent_dirs/shard.yml + crystal --version | string match -qr "(?[\d.]+)" + _tide_print_item crystal $tide_crystal_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_direnv.fish b/home-config/fish/functions/_tide_item_direnv.fish new file mode 100644 index 0000000..f3c892b --- /dev/null +++ b/home-config/fish/functions/_tide_item_direnv.fish @@ -0,0 +1,7 @@ +function _tide_item_direnv + set -q DIRENV_DIR || return + direnv status | string match -q 'Found RC allowed false' && + set -lx tide_direnv_color $tide_direnv_color_denied && + set -lx tide_direnv_bg_color $tide_direnv_bg_color_denied + _tide_print_item direnv $tide_direnv_icon +end diff --git a/home-config/fish/functions/_tide_item_distrobox.fish b/home-config/fish/functions/_tide_item_distrobox.fish new file mode 100644 index 0000000..5e06a8b --- /dev/null +++ b/home-config/fish/functions/_tide_item_distrobox.fish @@ -0,0 +1,4 @@ +function _tide_item_distrobox + test -e /etc/profile.d/distrobox_profile.sh && test -e /run/.containerenv && + _tide_print_item distrobox $tide_distrobox_icon' ' (string match -rg 'name="(.*)"' .*)' <$CLOUDSDK_CONFIG/configurations/config_$config && + _tide_print_item gcloud $tide_gcloud_icon' ' $project +end diff --git a/home-config/fish/functions/_tide_item_git.fish b/home-config/fish/functions/_tide_item_git.fish new file mode 100644 index 0000000..3154acc --- /dev/null +++ b/home-config/fish/functions/_tide_item_git.fish @@ -0,0 +1,72 @@ +function _tide_item_git + if git branch --show-current 2>/dev/null | string shorten -"$tide_git_truncation_strategy"m$tide_git_truncation_length | read -l location + git rev-parse --git-dir --is-inside-git-dir | read -fL gdir in_gdir + set location $_tide_location_color$location + else if test $pipestatus[1] != 0 + return + else if git tag --points-at HEAD | string shorten -"$tide_git_truncation_strategy"m$tide_git_truncation_length | read location + git rev-parse --git-dir --is-inside-git-dir | read -fL gdir in_gdir + set location '#'$_tide_location_color$location + else + git rev-parse --git-dir --is-inside-git-dir --short HEAD | read -fL gdir in_gdir location + set location @$_tide_location_color$location + end + + # Operation + if test -d $gdir/rebase-merge + # Turn ANY into ALL, via double negation + if not path is -v $gdir/rebase-merge/{msgnum,end} + read -f step <$gdir/rebase-merge/msgnum + read -f total_steps <$gdir/rebase-merge/end + end + test -f $gdir/rebase-merge/interactive && set -f operation rebase-i || set -f operation rebase-m + else if test -d $gdir/rebase-apply + if not path is -v $gdir/rebase-apply/{next,last} + read -f step <$gdir/rebase-apply/next + read -f total_steps <$gdir/rebase-apply/last + end + if test -f $gdir/rebase-apply/rebasing + set -f operation rebase + else if test -f $gdir/rebase-apply/applying + set -f operation am + else + set -f operation am/rebase + end + else if test -f $gdir/MERGE_HEAD + set -f operation merge + else if test -f $gdir/CHERRY_PICK_HEAD + set -f operation cherry-pick + else if test -f $gdir/REVERT_HEAD + set -f operation revert + else if test -f $gdir/BISECT_LOG + set -f operation bisect + end + + # Git status/stash + Upstream behind/ahead + test $in_gdir = true && set -l _set_dir_opt -C $gdir/.. + # Suppress errors in case we are in a bare repo or there is no upstream + set -l stat (git $_set_dir_opt --no-optional-locks status --porcelain 2>/dev/null) + string match -qr '(0|(?.*))\n(0|(?.*))\n(0|(?.*)) +(0|(?.*))\n(0|(?.*))(\n(0|(?.*))\t(0|(?.*)))?' \ + "$(git $_set_dir_opt stash list 2>/dev/null | count + string match -r ^UU $stat | count + string match -r ^[ADMR]. $stat | count + string match -r ^.[ADMR] $stat | count + string match -r '^\?\?' $stat | count + git rev-list --count --left-right @{upstream}...HEAD 2>/dev/null)" + + if test -n "$operation$conflicted" + set -g tide_git_bg_color $tide_git_bg_color_urgent + else if test -n "$staged$dirty$untracked" + set -g tide_git_bg_color $tide_git_bg_color_unstable + end + + _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location + set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps + set_color $tide_git_color_upstream; echo -ns ' ⇣'$behind ' ⇡'$ahead + set_color $tide_git_color_stash; echo -ns ' *'$stash + set_color $tide_git_color_conflicted; echo -ns ' ~'$conflicted + set_color $tide_git_color_staged; echo -ns ' +'$staged + set_color $tide_git_color_dirty; echo -ns ' !'$dirty + set_color $tide_git_color_untracked; echo -ns ' ?'$untracked) +end diff --git a/home-config/fish/functions/_tide_item_go.fish b/home-config/fish/functions/_tide_item_go.fish new file mode 100644 index 0000000..b9aacae --- /dev/null +++ b/home-config/fish/functions/_tide_item_go.fish @@ -0,0 +1,6 @@ +function _tide_item_go + if path is $_tide_parent_dirs/go.mod + go version | string match -qr "(?[\d.]+)" + _tide_print_item go $tide_go_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_java.fish b/home-config/fish/functions/_tide_item_java.fish new file mode 100644 index 0000000..804ec05 --- /dev/null +++ b/home-config/fish/functions/_tide_item_java.fish @@ -0,0 +1,6 @@ +function _tide_item_java + if path is $_tide_parent_dirs/pom.xml + java -version &| string match -qr "(?[\d.]+)" + _tide_print_item java $tide_java_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_jobs.fish b/home-config/fish/functions/_tide_item_jobs.fish new file mode 100644 index 0000000..2a02118 --- /dev/null +++ b/home-config/fish/functions/_tide_item_jobs.fish @@ -0,0 +1,7 @@ +function _tide_item_jobs + set -q _tide_jobs && if test $_tide_jobs -ge $tide_jobs_number_threshold + _tide_print_item jobs $tide_jobs_icon' ' $_tide_jobs + else + _tide_print_item jobs $tide_jobs_icon + end +end diff --git a/home-config/fish/functions/_tide_item_kubectl.fish b/home-config/fish/functions/_tide_item_kubectl.fish new file mode 100644 index 0000000..ab044b3 --- /dev/null +++ b/home-config/fish/functions/_tide_item_kubectl.fish @@ -0,0 +1,4 @@ +function _tide_item_kubectl + kubectl config view --minify --output 'jsonpath={.current-context}/{..namespace}' 2>/dev/null | read -l context && + _tide_print_item kubectl $tide_kubectl_icon' ' (string replace -r '/(|default)$' '' $context) +end diff --git a/home-config/fish/functions/_tide_item_nix_shell.fish b/home-config/fish/functions/_tide_item_nix_shell.fish new file mode 100644 index 0000000..647f606 --- /dev/null +++ b/home-config/fish/functions/_tide_item_nix_shell.fish @@ -0,0 +1,3 @@ +function _tide_item_nix_shell + set -q IN_NIX_SHELL && _tide_print_item nix_shell $tide_nix_shell_icon' ' $IN_NIX_SHELL +end diff --git a/home-config/fish/functions/_tide_item_node.fish b/home-config/fish/functions/_tide_item_node.fish new file mode 100644 index 0000000..fc57832 --- /dev/null +++ b/home-config/fish/functions/_tide_item_node.fish @@ -0,0 +1,6 @@ +function _tide_item_node + if path is $_tide_parent_dirs/package.json + node --version | string match -qr "v(?.*)" + _tide_print_item node $tide_node_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_os.fish b/home-config/fish/functions/_tide_item_os.fish new file mode 100644 index 0000000..8a6208c --- /dev/null +++ b/home-config/fish/functions/_tide_item_os.fish @@ -0,0 +1,3 @@ +function _tide_item_os + _tide_print_item os $tide_os_icon +end diff --git a/home-config/fish/functions/_tide_item_php.fish b/home-config/fish/functions/_tide_item_php.fish new file mode 100644 index 0000000..c8d28d9 --- /dev/null +++ b/home-config/fish/functions/_tide_item_php.fish @@ -0,0 +1,6 @@ +function _tide_item_php + if path is $_tide_parent_dirs/composer.json + php --version | string match -qr "(?[\d.]+)" + _tide_print_item php $tide_php_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_private_mode.fish b/home-config/fish/functions/_tide_item_private_mode.fish new file mode 100644 index 0000000..4eb4684 --- /dev/null +++ b/home-config/fish/functions/_tide_item_private_mode.fish @@ -0,0 +1,3 @@ +function _tide_item_private_mode + set -q _tide_private_mode && _tide_print_item private_mode $tide_private_mode_icon +end diff --git a/home-config/fish/functions/_tide_item_pulumi.fish b/home-config/fish/functions/_tide_item_pulumi.fish new file mode 100644 index 0000000..6302a7e --- /dev/null +++ b/home-config/fish/functions/_tide_item_pulumi.fish @@ -0,0 +1,19 @@ +function _tide_item_pulumi + if path filter $_tide_parent_dirs/Pulumi.yaml | read -l yaml_path + if command -q sha1sum + echo -n "$yaml_path" | sha1sum | string match -qr "(?.{40})" + else if command -q shasum + echo -n "$yaml_path" | shasum | string match -qr "(?.{40})" + else + return + end + + string match -qr 'name: *(?.*)' <$yaml_path + set -l workspace_file "$HOME/.pulumi/workspaces/$project_name-$path_hash-workspace.json" + + if test -e $workspace_file + string match -qr '"stack": *"(?.*)"' <$workspace_file + _tide_print_item pulumi $tide_pulumi_icon' ' $stack + end + end +end diff --git a/home-config/fish/functions/_tide_item_python.fish b/home-config/fish/functions/_tide_item_python.fish new file mode 100644 index 0000000..57f7075 --- /dev/null +++ b/home-config/fish/functions/_tide_item_python.fish @@ -0,0 +1,27 @@ +function _tide_item_python + if test -n "$VIRTUAL_ENV" + if command -q python3 + python3 --version | string match -qr "(?[\d.]+)" + else + python --version | string match -qr "(?[\d.]+)" + end + string match -qr "^.*/(?.*)/(?.*)" $VIRTUAL_ENV + # pipenv $VIRTUAL_ENV looks like /home/ilan/.local/share/virtualenvs/pipenv_project-EwRYuc3l + # Detect whether we are using pipenv by looking for 'virtualenvs'. If so, remove the hash at the end. + if test "$dir" = virtualenvs + string match -qr "(?.*)-.*" $base + _tide_print_item python $tide_python_icon' ' "$v ($base)" + else if contains -- "$base" virtualenv venv .venv env # avoid generic names + _tide_print_item python $tide_python_icon' ' "$v ($dir)" + else + _tide_print_item python $tide_python_icon' ' "$v ($base)" + end + else if path is .python-version Pipfile __init__.py pyproject.toml requirements.txt setup.py + if command -q python3 + python3 --version | string match -qr "(?[\d.]+)" + else + python --version | string match -qr "(?[\d.]+)" + end + _tide_print_item python $tide_python_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_ruby.fish b/home-config/fish/functions/_tide_item_ruby.fish new file mode 100644 index 0000000..bde84eb --- /dev/null +++ b/home-config/fish/functions/_tide_item_ruby.fish @@ -0,0 +1,6 @@ +function _tide_item_ruby + if path is $_tide_parent_dirs/{*.gemspec,Gemfile,Rakefile,.ruby-version} + ruby --version | string match -qr "(?[\d.]+)" + _tide_print_item ruby $tide_ruby_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_rustc.fish b/home-config/fish/functions/_tide_item_rustc.fish new file mode 100644 index 0000000..b46cd99 --- /dev/null +++ b/home-config/fish/functions/_tide_item_rustc.fish @@ -0,0 +1,6 @@ +function _tide_item_rustc + if path is $_tide_parent_dirs/Cargo.toml + rustc --version | string match -qr "(?[\d.]+)" + _tide_print_item rustc $tide_rustc_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_item_shlvl.fish b/home-config/fish/functions/_tide_item_shlvl.fish new file mode 100644 index 0000000..95dd5ff --- /dev/null +++ b/home-config/fish/functions/_tide_item_shlvl.fish @@ -0,0 +1,4 @@ +function _tide_item_shlvl + # Non-interactive shells do not increment SHLVL, so we don't need to subtract 1 + test $SHLVL -gt $tide_shlvl_threshold && _tide_print_item shlvl $tide_shlvl_icon' ' $SHLVL +end diff --git a/home-config/fish/functions/_tide_item_status.fish b/home-config/fish/functions/_tide_item_status.fish new file mode 100644 index 0000000..3a040fd --- /dev/null +++ b/home-config/fish/functions/_tide_item_status.fish @@ -0,0 +1,15 @@ +function _tide_item_status + if string match -qv 0 $_tide_pipestatus # If there is a failure anywhere in the pipestatus + if test "$_tide_pipestatus" = 1 # If simple failure + contains character $_tide_left_items || tide_status_bg_color=$tide_status_bg_color_failure \ + tide_status_color=$tide_status_color_failure _tide_print_item status $tide_status_icon_failure' ' 1 + else + fish_status_to_signal $_tide_pipestatus | string replace SIG '' | string join '|' | read -l out + test $_tide_status = 0 && _tide_print_item status $tide_status_icon' ' $out || + tide_status_bg_color=$tide_status_bg_color_failure tide_status_color=$tide_status_color_failure \ + _tide_print_item status $tide_status_icon_failure' ' $out + end + else if not contains character $_tide_left_items + _tide_print_item status $tide_status_icon + end +end diff --git a/home-config/fish/functions/_tide_item_terraform.fish b/home-config/fish/functions/_tide_item_terraform.fish new file mode 100644 index 0000000..c079ce3 --- /dev/null +++ b/home-config/fish/functions/_tide_item_terraform.fish @@ -0,0 +1,5 @@ +function _tide_item_terraform + path is $_tide_parent_dirs/.terraform && + terraform workspace show | string match -v default | read -l w && + _tide_print_item terraform $tide_terraform_icon' ' $w +end diff --git a/home-config/fish/functions/_tide_item_time.fish b/home-config/fish/functions/_tide_item_time.fish new file mode 100644 index 0000000..b8522bc --- /dev/null +++ b/home-config/fish/functions/_tide_item_time.fish @@ -0,0 +1,3 @@ +function _tide_item_time + _tide_print_item time (date +$tide_time_format) +end diff --git a/home-config/fish/functions/_tide_item_toolbox.fish b/home-config/fish/functions/_tide_item_toolbox.fish new file mode 100644 index 0000000..0b33f29 --- /dev/null +++ b/home-config/fish/functions/_tide_item_toolbox.fish @@ -0,0 +1,4 @@ +function _tide_item_toolbox + test -e /run/.toolboxenv && + _tide_print_item toolbox $tide_toolbox_icon' ' (string match -rg 'name="(.*)"' [\d.]+(-dev)?)" + _tide_print_item zig $tide_zig_icon' ' $v + end +end diff --git a/home-config/fish/functions/_tide_parent_dirs.fish b/home-config/fish/functions/_tide_parent_dirs.fish new file mode 100644 index 0000000..9f31b04 --- /dev/null +++ b/home-config/fish/functions/_tide_parent_dirs.fish @@ -0,0 +1,7 @@ +function _tide_parent_dirs --on-variable PWD + set -g _tide_parent_dirs (string escape ( + for dir in (string split / -- $PWD) + set -la parts $dir + string join / -- $parts + end)) +end diff --git a/home-config/fish/functions/_tide_print_item.fish b/home-config/fish/functions/_tide_print_item.fish new file mode 100644 index 0000000..db5c98b --- /dev/null +++ b/home-config/fish/functions/_tide_print_item.fish @@ -0,0 +1,22 @@ +function _tide_print_item -a item + v=tide_"$item"_bg_color set -f item_bg_color $$v + + if set -e add_prefix + set_color $item_bg_color -b normal + v=tide_"$_tide_side"_prompt_prefix echo -ns $$v + else if test "$item_bg_color" = "$prev_bg_color" + v=tide_"$_tide_side"_prompt_separator_same_color echo -ns $_tide_color_separator_same_color$$v + else if test $_tide_side = left + set_color $prev_bg_color -b $item_bg_color + echo -ns $tide_left_prompt_separator_diff_color + else + set_color $item_bg_color -b $prev_bg_color + echo -ns $tide_right_prompt_separator_diff_color + end + + v=tide_"$item"_color set_color $$v -b $item_bg_color + + echo -ns $_tide_pad $argv[2..] $_tide_pad + + set -g prev_bg_color $item_bg_color +end diff --git a/home-config/fish/functions/_tide_pwd.fish b/home-config/fish/functions/_tide_pwd.fish new file mode 100644 index 0000000..5447dd4 --- /dev/null +++ b/home-config/fish/functions/_tide_pwd.fish @@ -0,0 +1,42 @@ +set_color -o $tide_pwd_color_anchors | read -l color_anchors +set_color $tide_pwd_color_truncated_dirs | read -l color_truncated +set -l reset_to_color_dirs (set_color normal -b $tide_pwd_bg_color; set_color $tide_pwd_color_dirs) + +set -l unwritable_icon $tide_pwd_icon_unwritable' ' +set -l home_icon $tide_pwd_icon_home' ' +set -l pwd_icon $tide_pwd_icon' ' + +eval "function _tide_pwd + if set -l split_pwd (string replace -r '^$HOME' '~' -- \$PWD | string split /) + test -w . && set -f split_output \"$pwd_icon\$split_pwd[1]\" \$split_pwd[2..] || + set -f split_output \"$unwritable_icon\$split_pwd[1]\" \$split_pwd[2..] + set split_output[-1] \"$color_anchors\$split_output[-1]$reset_to_color_dirs\" + else + set -f split_output \"$home_icon$color_anchors~\" + end + + string join / -- \$split_output | string length -V | read -g _tide_pwd_len + + i=1 for dir_section in \$split_pwd[2..-2] + string join -- / \$split_pwd[..\$i] | string replace '~' $HOME | read -l parent_dir # Uses i before increment + + math \$i+1 | read i + + if path is \$parent_dir/\$dir_section/\$tide_pwd_markers + set split_output[\$i] \"$color_anchors\$dir_section$reset_to_color_dirs\" + else if test \$_tide_pwd_len -gt \$dist_btwn_sides + string match -qr \"(?\..|.)\" \$dir_section + + set -l glob \$parent_dir/\$trunc*/ + set -e glob[(contains -i \$parent_dir/\$dir_section/ \$glob)] # This is faster than inverse string match + + while string match -qr \"^\$parent_dir/\$(string escape --style=regex \$trunc)\" \$glob && + string match -qr \"(?\$(string escape --style=regex \$trunc).)\" \$dir_section + end + test -n \"\$trunc\" && set split_output[\$i] \"$color_truncated\$trunc$reset_to_color_dirs\" && + string join / \$split_output | string length -V | read _tide_pwd_len + end + end + + string join -- / \"$reset_to_color_dirs\$split_output[1]\" \$split_output[2..] +end" diff --git a/home-config/fish/functions/_tide_remove_unusable_items.fish b/home-config/fish/functions/_tide_remove_unusable_items.fish new file mode 100644 index 0000000..deb4c10 --- /dev/null +++ b/home-config/fish/functions/_tide_remove_unusable_items.fish @@ -0,0 +1,25 @@ +function _tide_remove_unusable_items + # Remove tool-specific items for tools the machine doesn't have installed + set -l removed_items + for item in aws crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi python ruby rustc terraform toolbox zig + contains $item $tide_left_prompt_items $tide_right_prompt_items || continue + + set -l cli_names $item + switch $item + case distrobox # there is no 'distrobox' command inside the container + set cli_names distrobox-export # 'distrobox-export' and 'distrobox-host-exec' are available + case nix_shell + set cli_names nix nix-shell + case python + set cli_names python python3 + end + type --query $cli_names || set -a removed_items $item + end + + set -U _tide_left_items (for item in $tide_left_prompt_items + contains $item $removed_items || echo $item + end) + set -U _tide_right_items (for item in $tide_right_prompt_items + contains $item $removed_items || echo $item + end) +end diff --git a/home-config/fish/functions/_tide_sub_bug-report.fish b/home-config/fish/functions/_tide_sub_bug-report.fish new file mode 100644 index 0000000..a8065c8 --- /dev/null +++ b/home-config/fish/functions/_tide_sub_bug-report.fish @@ -0,0 +1,73 @@ +function _tide_sub_bug-report + argparse c/clean v/verbose check -- $argv + + set -l fish_path (status fish-path) + + if set -q _flag_clean + HOME=(mktemp -d) $fish_path --init-command "curl --silent \ + https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | + source && fisher install ilancosman/tide@v6" + else if set -q _flag_verbose + set --long | string match -r "^_?tide.*" | # Get only tide variables + string match -r --invert "^_tide_prompt_var.*" # Remove _tide_prompt_var + else + set -l fish_version ($fish_path --version | string match -r "fish, version (\d\.\d\.\d)")[2] + _tide_check_version Fish fish-shell/fish-shell "(\d\.\d\.\d)" $fish_version || return + + set -l tide_version (tide --version | string match -r "tide, version (\d\.\d\.\d)")[2] + _tide_check_version Tide IlanCosman/tide "v(\d\.\d\.\d)" $tide_version || return + + if command --query git + test (git --version | string match -r "git version ([\d\.]*)" | string replace --all . '')[2] -gt 2220 + _tide_check_condition \ + "Your git version is too old." \ + "Tide requires at least version 2.22." \ + "Please update before submitting a bug report." || return + end + + # Check that omf is not installed + not functions --query omf + _tide_check_condition \ + "Tide does not work with oh-my-fish installed." \ + "Please uninstall it before submitting a bug report." || return + + if not set -q _flag_check + set -l fish_startup_time ($fish_path -ic "time $fish_path -c exit" 2>| + string match -r "Executed in(.*)fish" | string trim)[2] + + read --local --prompt-str "What operating system are you using? (e.g Ubuntu 20.04): " os + read --local --prompt-str "What terminal emulator are you using? (e.g Kitty): " terminal_emulator + + printf '%b\n' "\nPlease copy the following information into the issue:\n" \ + "fish version: $fish_version" \ + "tide version: $tide_version" \ + "term: $TERM" \ + "os: $os" \ + "terminal emulator: $terminal_emulator" \ + "fish startup: $fish_startup_time" \ + "fisher plugins: $_fisher_plugins" + end + end +end + +function _tide_check_version -a program_name repo_name regex_to_get_version current_version + curl --silent https://github.com/$repo_name/releases/latest | + string match -r ".*$repo_name/releases/tag/$regex_to_get_version.*" | + read --local --line __ latestVersion + + string match --quiet -r "^$latestVersion" "$current_version" + _tide_check_condition \ + "Your $program_name version is out of date." \ + "The latest is $latestVersion. You have $current_version." \ + "Please update before submitting a bug report." +end + +function _tide_check_condition + if test "$status" != 0 + set_color red + printf '%s\n' $argv + set_color normal + return 1 + end + return 0 +end diff --git a/home-config/fish/functions/_tide_sub_configure.fish b/home-config/fish/functions/_tide_sub_configure.fish new file mode 100644 index 0000000..22faf3a --- /dev/null +++ b/home-config/fish/functions/_tide_sub_configure.fish @@ -0,0 +1,156 @@ +set -g _tide_color_dark_blue 0087AF +set -g _tide_color_dark_green 5FAF00 +set -g _tide_color_gold D7AF00 +set -g _tide_color_green 5FD700 +set -g _tide_color_light_blue 00AFFF + +# Create an empty fake function for each item +for func in _fake(functions --all | string match --entire _tide_item) + function $func + end +end + +for file in (status dirname)/tide/configure/{choices, functions}/**.fish + source $file +end + +function _tide_sub_configure + set -l choices (path basename (status dirname)/tide/configure/choices/**.fish | path change-extension '') + argparse auto $choices= -- $argv + + for var in (set -l --names | string match -e _flag) + set -x $var $$var + end + + if set -q _flag_auto + set -fx _flag_finish 'Overwrite your current tide config' + else if test $COLUMNS -lt 55 -o $LINES -lt 21 + echo 'Terminal size too small; must be at least 55 x 21' + return 1 + end + + _tide_detect_os | read -g --line os_branding_icon os_branding_color os_branding_bg_color + + set -g fake_columns $COLUMNS + test $fake_columns -gt 90 && set fake_columns 90 + set -g fake_lines $LINES + + set -g _tide_selected_option + _next_choice all/style +end + +function _next_choice -a nextChoice + set -q _tide_selected_option || return 0 + set -l cmd (string split '/' $nextChoice)[2] + $cmd +end + +function _tide_title -a text + set -q _flag_auto && return + + command -q clear && clear + set_color -o + string pad --width (math --scale=0 "$fake_columns/2" + (string length $text)/2) $text + set_color normal + + set -g _tide_configure_first_option_after_title +end + +function _tide_option -a symbol text + set -ga _tide_symbol_list $symbol + set -ga _tide_option_list $text + + if not set -q _flag_auto + set -g _tide_configure_first_prompt_after_option + + set_color -o + set -e _tide_configure_first_option_after_title || echo + echo "($symbol) $text" + set_color normal + end +end + +function _tide_menu -a func + if set -q _flag_auto + set -l flag_var_name _flag_$func + set -g _tide_selected_option $$flag_var_name + + if test -z "$_tide_selected_option" + echo "Missing input for choice '$func'" + _tide_exit_configure + else if not contains $_tide_selected_option $_tide_option_list + echo "Invalid input '$_tide_selected_option' for choice '$func'" + _tide_exit_configure + else + set -e _tide_symbol_list + set -e _tide_option_list + end + return + end + + argparse no-restart -- $argv # Add no-restart option for first menu + + echo + if not set -q _flag_no_restart + set -f r r + echo '(r) Restart from the beginning' + end + echo '(q) Quit and do nothing'\n + + while read --nchars 1 --prompt-str \ + "$(set_color -o)Choice [$(string join '/' $_tide_symbol_list $r q)] $(set_color normal)" input + switch $input + case r + set -q _flag_no_restart && continue + set -e _tide_symbol_list + set -e _tide_option_list + _next_choice all/style + break + case q + _tide_exit_configure + set -e _tide_symbol_list + set -e _tide_option_list + command -q clear && clear + break + case $_tide_symbol_list + set -g _tide_selected_option $_tide_option_list[(contains -i $input $_tide_symbol_list)] + test "$func" != finish && + set -a _tide_configure_current_options --$func=(string escape $_tide_selected_option) + set -e _tide_symbol_list + set -e _tide_option_list + break + end + end +end + +function _tide_display_prompt + set -q _flag_auto && return + + _fake_tide_cache_variables + set -l prompt (_fake_tide_prompt) + + set -l bottom_left_prompt_string_length (string length --visible $prompt[-1]) + set -l right_prompt_string (string pad --width (math $fake_columns-$bottom_left_prompt_string_length) $prompt[1]) + set -l prompt[-1] "$prompt[-1]$right_prompt_string" + + if set -q _configure_transient + if contains newline $fake_tide_left_prompt_items + string unescape $prompt[3..] + else + _fake_tide_item_character + echo + end + else + if not set -q _tide_configure_first_prompt_after_option + test "$fake_tide_prompt_add_newline_before" = true && echo + end + string unescape $prompt[2..] + end + + set -e _tide_configure_first_prompt_after_option + set_color normal +end + +function _tide_exit_configure + set -e _tide_selected_option # Skip through all switch and _next_choice +end diff --git a/home-config/fish/functions/_tide_sub_reload.fish b/home-config/fish/functions/_tide_sub_reload.fish new file mode 100644 index 0000000..5a45fbd --- /dev/null +++ b/home-config/fish/functions/_tide_sub_reload.fish @@ -0,0 +1,3 @@ +function _tide_sub_reload + source (functions --details fish_prompt) +end diff --git a/home-config/fish/functions/fish_mode_prompt.fish b/home-config/fish/functions/fish_mode_prompt.fish new file mode 100644 index 0000000..f37cf7d --- /dev/null +++ b/home-config/fish/functions/fish_mode_prompt.fish @@ -0,0 +1 @@ +# Disable default vi prompt diff --git a/home-config/fish/functions/fish_prompt.fish b/home-config/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..3b58b7b --- /dev/null +++ b/home-config/fish/functions/fish_prompt.fish @@ -0,0 +1,171 @@ +function fish_prompt +end # In case this file gets loaded non-interactively, e.g by conda +status is-interactive || exit + +_tide_remove_unusable_items +_tide_cache_variables +_tide_parent_dirs +source (functions --details _tide_pwd) + +set -l prompt_var _tide_prompt_$fish_pid +set -U $prompt_var # Set var here so if we erase $prompt_var, bg job won't set a uvar + +set_color normal | read -l color_normal +status fish-path | read -l fish_path + +# _tide_repaint prevents us from creating a second background job +function _tide_refresh_prompt --on-variable $prompt_var --on-variable COLUMNS + set -g _tide_repaint + commandline -f repaint +end + +if contains newline $_tide_left_items # two line prompt initialization + test "$tide_prompt_add_newline_before" = true && set -l add_newline '\n' + + set_color $tide_prompt_color_frame_and_connection -b normal | read -l prompt_and_frame_color + + set -l column_offset 5 + test "$tide_left_prompt_frame_enabled" = true && + set -l top_left_frame "$prompt_and_frame_color╭─" && + set -l bot_left_frame "$prompt_and_frame_color╰─" && + set column_offset (math $column_offset-2) + test "$tide_right_prompt_frame_enabled" = true && + set -l top_right_frame "$prompt_and_frame_color─╮" && + set -l bot_right_frame "$prompt_and_frame_color─╯" && + set column_offset (math $column_offset-2) + + if test "$tide_prompt_transient_enabled" = true + eval " +function fish_prompt + _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint + jobs -q && jobs -p | count | read -lx _tide_jobs + $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus +set _tide_parent_dirs \$_tide_parent_dirs +PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" & + builtin disown + + command kill \$_tide_last_pid 2>/dev/null + set -g _tide_last_pid \$last_pid + end + + if not set -q _tide_transient + math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][3]\")+$column_offset | read -lx dist_btwn_sides + + echo -n $add_newline'$top_left_frame'(string replace @PWD@ (_tide_pwd) \"\$$prompt_var[1][1]\")'$prompt_and_frame_color' + string repeat -Nm(math max 0, \$dist_btwn_sides-\$_tide_pwd_len) '$tide_prompt_icon_connection' + + echo \"\$$prompt_var[1][3]$top_right_frame\" + end + echo -n \e\[0J\"$bot_left_frame\$$prompt_var[1][2]$color_normal \" +end + +function fish_right_prompt + set -e _tide_transient || string unescape \"\$$prompt_var[1][4]$bot_right_frame$color_normal\" +end" + else + eval " +function fish_prompt + _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint + jobs -q && jobs -p | count | read -lx _tide_jobs + $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus +set _tide_parent_dirs \$_tide_parent_dirs +PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" & + builtin disown + + command kill \$_tide_last_pid 2>/dev/null + set -g _tide_last_pid \$last_pid + end + + math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][3]\")+$column_offset | read -lx dist_btwn_sides + + echo -ns $add_newline'$top_left_frame'(string replace @PWD@ (_tide_pwd) \"\$$prompt_var[1][1]\")'$prompt_and_frame_color' + string repeat -Nm(math max 0, \$dist_btwn_sides-\$_tide_pwd_len) '$tide_prompt_icon_connection' + echo -ns \"\$$prompt_var[1][3]$top_right_frame\"\n\"$bot_left_frame\$$prompt_var[1][2]$color_normal \" +end + +function fish_right_prompt + string unescape \"\$$prompt_var[1][4]$bot_right_frame$color_normal\" +end" + end +else # one line prompt initialization + test "$tide_prompt_add_newline_before" = true && set -l add_newline '\0' + + math 5 -$tide_prompt_min_cols | read -l column_offset + test $column_offset -ge 0 && set column_offset "+$column_offset" + + if test "$tide_prompt_transient_enabled" = true + eval " +function fish_prompt + set -lx _tide_status \$status + _tide_pipestatus=\$pipestatus if not set -e _tide_repaint + jobs -q && jobs -p | count | read -lx _tide_jobs + $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus +set _tide_parent_dirs \$_tide_parent_dirs +PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" & + builtin disown + + command kill \$_tide_last_pid 2>/dev/null + set -g _tide_last_pid \$last_pid + end + + if set -q _tide_transient + echo -n \e\[0J + add_prefix= _tide_item_character + echo -n '$color_normal ' + else + math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][2]\")$column_offset | read -lx dist_btwn_sides + string replace @PWD@ (_tide_pwd) $add_newline \$$prompt_var[1][1]'$color_normal ' + end +end + +function fish_right_prompt + set -e _tide_transient || string unescape \"\$$prompt_var[1][2]$color_normal\" +end" + else + eval " +function fish_prompt + _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint + jobs -q && jobs -p | count | read -lx _tide_jobs + $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus +set _tide_parent_dirs \$_tide_parent_dirs +PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" & + builtin disown + + command kill \$_tide_last_pid 2>/dev/null + set -g _tide_last_pid \$last_pid + end + + math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][2]\")$column_offset | read -lx dist_btwn_sides + string replace @PWD@ (_tide_pwd) $add_newline \$$prompt_var[1][1]'$color_normal ' +end + +function fish_right_prompt + string unescape \"\$$prompt_var[1][2]$color_normal\" +end" + end +end + +eval "function _tide_on_fish_exit --on-event fish_exit + set -e $prompt_var +end" + +if test "$tide_prompt_transient_enabled" = true + function _tide_enter_transient + # If the commandline will be executed, or is empty + if commandline --is-valid || test -z "$(commandline)" + # Pager open usually means selecting, not running + # Can be untrue, but it's better than the alternative + if not commandline --paging-mode + set -g _tide_transient + set -g _tide_repaint + commandline -f repaint + end + end + commandline -f execute + end + + bind \r _tide_enter_transient + bind \n _tide_enter_transient + bind -M insert \r _tide_enter_transient + bind -M insert \n _tide_enter_transient +end diff --git a/home-config/fish/functions/fisher.fish b/home-config/fish/functions/fisher.fish new file mode 100644 index 0000000..b1513d3 --- /dev/null +++ b/home-config/fish/functions/fisher.fish @@ -0,0 +1,240 @@ +function fisher --argument-names cmd --description "A plugin manager for Fish" + set --query fisher_path || set --local fisher_path $__fish_config_dir + set --local fisher_version 4.4.4 + set --local fish_plugins $__fish_config_dir/fish_plugins + + switch "$cmd" + case -v --version + echo "fisher, version $fisher_version" + case "" -h --help + echo "Usage: fisher install Install plugins" + echo " fisher remove Remove installed plugins" + echo " fisher update Update installed plugins" + echo " fisher update Update all installed plugins" + echo " fisher list [] List installed plugins matching regex" + echo "Options:" + echo " -v, --version Print version" + echo " -h, --help Print this help message" + echo "Variables:" + echo " \$fisher_path Plugin installation path. Default: $__fish_config_dir" | string replace --regex -- $HOME \~ + case ls list + string match --entire --regex -- "$argv[2]" $_fisher_plugins + case install update remove + isatty || read --local --null --array stdin && set --append argv $stdin + + set --local install_plugins + set --local update_plugins + set --local remove_plugins + set --local arg_plugins $argv[2..-1] + set --local old_plugins $_fisher_plugins + set --local new_plugins + + test -e $fish_plugins && set --local file_plugins (string match --regex -- '^[^\s]+$' <$fish_plugins) + + if ! set --query argv[2] + if test "$cmd" != update + echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1 + else if ! set --query file_plugins + echo "fisher: \"$fish_plugins\" file not found: \"$cmd\"" >&2 && return 1 + end + set arg_plugins $file_plugins + end + + for plugin in $arg_plugins + set plugin (test -e "$plugin" && realpath $plugin || string lower -- $plugin) + contains -- "$plugin" $new_plugins || set --append new_plugins $plugin + end + + if set --query argv[2] + for plugin in $new_plugins + if contains -- "$plugin" $old_plugins + test "$cmd" = remove && + set --append remove_plugins $plugin || + set --append update_plugins $plugin + else if test "$cmd" = install + set --append install_plugins $plugin + else + echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1 + end + end + else + for plugin in $new_plugins + contains -- "$plugin" $old_plugins && + set --append update_plugins $plugin || + set --append install_plugins $plugin + end + + for plugin in $old_plugins + contains -- "$plugin" $new_plugins || set --append remove_plugins $plugin + end + end + + set --local pid_list + set --local source_plugins + set --local fetch_plugins $update_plugins $install_plugins + set --local fish_path (status fish-path) + + echo (set_color --bold)fisher $cmd version $fisher_version(set_color normal) + + for plugin in $fetch_plugins + set --local source (command mktemp -d) + set --append source_plugins $source + + command mkdir -p $source/{completions,conf.d,themes,functions} + + $fish_path --command " + if test -e $plugin + command cp -Rf $plugin/* $source + else + set temp (command mktemp -d) + set repo (string split -- \@ $plugin) || set repo[2] HEAD + + if set path (string replace --regex -- '^(https://)?gitlab.com/' '' \$repo[1]) + set name (string split -- / \$path)[-1] + set url https://gitlab.com/\$path/-/archive/\$repo[2]/\$name-\$repo[2].tar.gz + else + set url https://api.github.com/repos/\$repo[1]/tarball/\$repo[2] + end + + echo Fetching (set_color --underline)\$url(set_color normal) + + if command curl -q --silent -L \$url | command tar -xzC \$temp -f - 2>/dev/null + command cp -Rf \$temp/*/* $source + else + echo fisher: Invalid plugin name or host unavailable: \\\"$plugin\\\" >&2 + command rm -rf $source + end + + command rm -rf \$temp + end + + set files $source/* && string match --quiet --regex -- .+\.fish\\\$ \$files + " & + + set --append pid_list (jobs --last --pid) + end + + wait $pid_list 2>/dev/null + + for plugin in $fetch_plugins + if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source + if set --local index (contains --index -- "$plugin" $install_plugins) + set --erase install_plugins[$index] + else + set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)] + end + end + end + + for plugin in $update_plugins $remove_plugins + if set --local index (contains --index -- "$plugin" $_fisher_plugins) + set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files + + if contains -- "$plugin" $remove_plugins + for name in (string replace --filter --regex -- '.+/conf\.d/([^/]+)\.fish$' '$1' $$plugin_files_var) + emit {$name}_uninstall + end + printf "%s\n" Removing\ (set_color red --bold)$plugin(set_color normal) " "$$plugin_files_var | string replace -- \~ ~ + set --erase _fisher_plugins[$index] + end + + command rm -rf (string replace -- \~ ~ $$plugin_files_var) + + functions --erase (string replace --filter --regex -- '.+/functions/([^/]+)\.fish$' '$1' $$plugin_files_var) + + for name in (string replace --filter --regex -- '.+/completions/([^/]+)\.fish$' '$1' $$plugin_files_var) + complete --erase --command $name + end + + set --erase $plugin_files_var + end + end + + if set --query update_plugins[1] || set --query install_plugins[1] + command mkdir -p $fisher_path/{functions,themes,conf.d,completions} + end + + for plugin in $update_plugins $install_plugins + set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] + set --local files $source/{functions,themes,conf.d,completions}/* + + if set --local index (contains --index -- $plugin $install_plugins) + set --local user_files $fisher_path/{functions,themes,conf.d,completions}/* + set --local conflict_files + + for file in (string replace -- $source/ $fisher_path/ $files) + contains -- $file $user_files && set --append conflict_files $file + end + + if set --query conflict_files[1] && set --erase install_plugins[$index] + echo -s "fisher: Cannot install \"$plugin\": please remove or move conflicting files first:" \n" "$conflict_files >&2 + continue + end + end + + for file in (string replace -- $source/ "" $files) + command cp -RLf $source/$file $fisher_path/$file + end + + set --local plugin_files_var _fisher_(string escape --style=var -- $plugin)_files + + set --query files[1] && set --universal $plugin_files_var (string replace -- $source $fisher_path $files | string replace -- ~ \~) + + contains -- $plugin $_fisher_plugins || set --universal --append _fisher_plugins $plugin + contains -- $plugin $install_plugins && set --local event install || set --local event update + + printf "%s\n" Installing\ (set_color --bold)$plugin(set_color normal) " "$$plugin_files_var | string replace -- \~ ~ + + for file in (string match --regex -- '.+/[^/]+\.fish$' $$plugin_files_var | string replace -- \~ ~) + source $file + if set --local name (string replace --regex -- '.+conf\.d/([^/]+)\.fish$' '$1' $file) + emit {$name}_$event + end + end + end + + command rm -rf $source_plugins + + if set --query _fisher_plugins[1] + set --local commit_plugins + + for plugin in $file_plugins + contains -- (string lower -- $plugin) (string lower -- $_fisher_plugins) && set --append commit_plugins $plugin + end + + for plugin in $_fisher_plugins + contains -- (string lower -- $plugin) (string lower -- $commit_plugins) || set --append commit_plugins $plugin + end + + printf "%s\n" $commit_plugins >$fish_plugins + else + set --erase _fisher_plugins + command rm -f $fish_plugins + end + + set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins) + + test "$total" != "0 0 0" && echo (string join ", " ( + test $total[1] = 0 || echo "Installed $total[1]") ( + test $total[2] = 0 || echo "Updated $total[2]") ( + test $total[3] = 0 || echo "Removed $total[3]") + ) plugin/s + case \* + echo "fisher: Unknown command: \"$cmd\"" >&2 && return 1 + end +end + +if ! set --query _fisher_upgraded_to_4_4 + set --universal _fisher_upgraded_to_4_4 + if functions --query _fisher_list + set --query XDG_DATA_HOME[1] || set --local XDG_DATA_HOME ~/.local/share + command rm -rf $XDG_DATA_HOME/fisher + functions --erase _fisher_{list,plugin_parse} + fisher update >/dev/null 2>/dev/null + else + for var in (set --names | string match --entire --regex '^_fisher_.+_files$') + set $var (string replace -- ~ \~ $$var) + end + functions --erase _fisher_fish_postexec + end +end diff --git a/home-config/fish/functions/fzf_configure_bindings.fish b/home-config/fish/functions/fzf_configure_bindings.fish new file mode 100644 index 0000000..4b4e7a2 --- /dev/null +++ b/home-config/fish/functions/fzf_configure_bindings.fish @@ -0,0 +1,46 @@ +# Always installs bindings for insert and default mode for simplicity and b/c it has almost no side-effect +# https://gitter.im/fish-shell/fish-shell?at=60a55915ee77a74d685fa6b1 +function fzf_configure_bindings --description "Installs the default key bindings for fzf.fish with user overrides passed as options." + # no need to install bindings if not in interactive mode or running tests + status is-interactive || test "$CI" = true; or return + + set -f options_spec h/help 'directory=?' 'git_log=?' 'git_status=?' 'history=?' 'processes=?' 'variables=?' + argparse --max-args=0 --ignore-unknown $options_spec -- $argv 2>/dev/null + if test $status -ne 0 + echo "Invalid option or a positional argument was provided." >&2 + _fzf_configure_bindings_help + return 22 + else if set --query _flag_help + _fzf_configure_bindings_help + return + else + # Initialize with default key sequences and then override or disable them based on flags + # index 1 = directory, 2 = git_log, 3 = git_status, 4 = history, 5 = processes, 6 = variables + set -f key_sequences \e\cf \e\cl \e\cs \cr \e\cp \cv # \c = control, \e = escape + set --query _flag_directory && set key_sequences[1] "$_flag_directory" + set --query _flag_git_log && set key_sequences[2] "$_flag_git_log" + set --query _flag_git_status && set key_sequences[3] "$_flag_git_status" + set --query _flag_history && set key_sequences[4] "$_flag_history" + set --query _flag_processes && set key_sequences[5] "$_flag_processes" + set --query _flag_variables && set key_sequences[6] "$_flag_variables" + + # If fzf bindings already exists, uninstall it first for a clean slate + if functions --query _fzf_uninstall_bindings + _fzf_uninstall_bindings + end + + for mode in default insert + test -n $key_sequences[1] && bind --mode $mode $key_sequences[1] _fzf_search_directory + test -n $key_sequences[2] && bind --mode $mode $key_sequences[2] _fzf_search_git_log + test -n $key_sequences[3] && bind --mode $mode $key_sequences[3] _fzf_search_git_status + test -n $key_sequences[4] && bind --mode $mode $key_sequences[4] _fzf_search_history + test -n $key_sequences[5] && bind --mode $mode $key_sequences[5] _fzf_search_processes + test -n $key_sequences[6] && bind --mode $mode $key_sequences[6] "$_fzf_search_vars_command" + end + + function _fzf_uninstall_bindings --inherit-variable key_sequences + bind --erase -- $key_sequences + bind --erase --mode insert -- $key_sequences + end + end +end diff --git a/home-config/fish/functions/tide.fish b/home-config/fish/functions/tide.fish new file mode 100644 index 0000000..092a722 --- /dev/null +++ b/home-config/fish/functions/tide.fish @@ -0,0 +1,28 @@ +function tide --description 'Manage your Tide prompt' + argparse --stop-nonopt v/version h/help -- $argv + + if set -q _flag_version + echo 'tide, version 6.1.1' + else if set -q _flag_help + _tide_help + else if functions --query _tide_sub_$argv[1] + _tide_sub_$argv[1] $argv[2..] + else + _tide_help + return 1 + end +end + +function _tide_help + printf %s\n \ + 'Usage: tide [options] subcommand [options]' \ + '' \ + 'Options:' \ + ' -v or --version print tide version number' \ + ' -h or --help print this help message' \ + '' \ + 'Subcommands:' \ + ' configure run interactive configuration wizard' \ + ' reload reload tide configuration' \ + ' bug-report print info for use in bug reports' +end diff --git a/home-config/fish/functions/tide/configure/choices/all/finish.fish b/home-config/fish/functions/tide/configure/choices/all/finish.fish new file mode 100644 index 0000000..f670b1e --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/finish.fish @@ -0,0 +1,46 @@ +function finish + _tide_title Finish + + echo + set_color red + _tide_option y 'Overwrite your current tide config' + set_color normal + echo + + _tide_option p 'Exit and print the config you just generated' + echo + + _tide_menu (status function) + switch $_tide_selected_option + case 'Overwrite your current tide config' + _tide_finish + command -q clear && clear + set -q _flag_auto || _tide_print_configure_current_options + case 'Exit and print the config you just generated' + _tide_exit_configure + command -q clear && clear + _tide_print_configure_current_options + end +end + +function _tide_finish + _tide_exit_configure + + # Deal with prompt char/vi mode + contains character $fake_tide_left_prompt_items || set -p fake_tide_left_prompt_items vi_mode + + # Set the real variables + for fakeVar in (set --names | string match -r "^fake_tide.*") + set -U (string replace 'fake_' '' $fakeVar) $$fakeVar + end + + # Make sure old prompt won't display + set -e $_tide_prompt_var 2>/dev/null + + # Re-initialize the prompt + tide reload +end + +function _tide_print_configure_current_options + _tide_fish_colorize "tide configure --auto $_tide_configure_current_options" +end diff --git a/home-config/fish/functions/tide/configure/choices/all/icons.fish b/home-config/fish/functions/tide/configure/choices/all/icons.fish new file mode 100644 index 0000000..be167bb --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/icons.fish @@ -0,0 +1,33 @@ +function icons + _tide_title Icons + + _tide_option 1 'Few icons' + _tide_display_prompt + + _tide_option 2 'Many icons' + _enable_icons + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case 'Few icons' + _disable_icons + end + _next_choice all/transient +end + +function _enable_icons + set -p fake_tide_left_prompt_items os + set -g fake_tide_pwd_icon  + set -g fake_tide_pwd_icon_home  + set -g fake_tide_cmd_duration_icon  + set -g fake_tide_git_icon  +end + +function _disable_icons + _tide_find_and_remove os fake_tide_left_prompt_items + set fake_tide_pwd_icon + set fake_tide_pwd_icon_home + set fake_tide_cmd_duration_icon + set fake_tide_git_icon +end diff --git a/home-config/fish/functions/tide/configure/choices/all/prompt_colors.fish b/home-config/fish/functions/tide/configure/choices/all/prompt_colors.fish new file mode 100644 index 0000000..247ef4e --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/prompt_colors.fish @@ -0,0 +1,26 @@ +function prompt_colors + _tide_title 'Prompt Colors' + + _tide_option 1 'True color' + _tide_display_prompt + + _tide_option 2 '16 colors' + _load_config "$_tide_configure_style"_16color + set -g _tide_16color true + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case 'True color' + _load_config "$_tide_configure_style" + set -e _tide_16color + switch $_tide_configure_style + case lean rainbow + _next_choice all/show_time + case classic + _next_choice classic/classic_prompt_color + end + case '16 colors' + _next_choice all/show_time + end +end diff --git a/home-config/fish/functions/tide/configure/choices/all/prompt_connection.fish b/home-config/fish/functions/tide/configure/choices/all/prompt_connection.fish new file mode 100644 index 0000000..ff76546 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/prompt_connection.fish @@ -0,0 +1,31 @@ +function prompt_connection + _tide_title 'Prompt Connection' + + _tide_option 1 Disconnected + set -g fake_tide_prompt_icon_connection ' ' + _tide_display_prompt + + _tide_option 2 Dotted + set -g fake_tide_prompt_icon_connection '·' + _tide_display_prompt + + _tide_option 3 Solid + set -g fake_tide_prompt_icon_connection '─' + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Disconnected + set -g fake_tide_prompt_icon_connection ' ' + case Dotted + set -g fake_tide_prompt_icon_connection '·' + case Solid + set -g fake_tide_prompt_icon_connection '─' + end + switch $_tide_configure_style + case lean + _next_choice all/prompt_connection_andor_frame_color + case classic rainbow + _next_choice powerline/powerline_right_prompt_frame + end +end diff --git a/home-config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish b/home-config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish new file mode 100644 index 0000000..cefbf2c --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish @@ -0,0 +1,40 @@ +function prompt_connection_andor_frame_color + if test "$_tide_16color" = true || + test "$fake_tide_left_prompt_frame_enabled" = false -a \ + "$fake_tide_right_prompt_frame_enabled" = false -a \ + "$fake_tide_prompt_icon_connection" = ' ' + _next_choice all/prompt_spacing + return 0 + end + + _tide_title "Connection & Frame Color" + + _tide_option 1 Lightest + set -g fake_tide_prompt_color_frame_and_connection 808080 + _tide_display_prompt + + _tide_option 2 Light + set -g fake_tide_prompt_color_frame_and_connection 6C6C6C + _tide_display_prompt + + _tide_option 3 Dark + set -g fake_tide_prompt_color_frame_and_connection 585858 + _tide_display_prompt + + _tide_option 4 Darkest + set -g fake_tide_prompt_color_frame_and_connection 444444 + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Lightest + set -g fake_tide_prompt_color_frame_and_connection 808080 + case Light + set -g fake_tide_prompt_color_frame_and_connection 6C6C6C + case Dark + set -g fake_tide_prompt_color_frame_and_connection 585858 + case Darkest + set -g fake_tide_prompt_color_frame_and_connection 444444 + end + _next_choice all/prompt_spacing +end diff --git a/home-config/fish/functions/tide/configure/choices/all/prompt_spacing.fish b/home-config/fish/functions/tide/configure/choices/all/prompt_spacing.fish new file mode 100644 index 0000000..f68be68 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/prompt_spacing.fish @@ -0,0 +1,22 @@ +function prompt_spacing + _tide_title 'Prompt Spacing' + + _tide_option 1 Compact + set -g fake_tide_prompt_add_newline_before false + _tide_display_prompt + _tide_display_prompt + + _tide_option 2 Sparse + set -g fake_tide_prompt_add_newline_before true + _tide_display_prompt + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Compact + set -g fake_tide_prompt_add_newline_before false + case Sparse + set -g fake_tide_prompt_add_newline_before true + end + _next_choice all/icons +end diff --git a/home-config/fish/functions/tide/configure/choices/all/show_time.fish b/home-config/fish/functions/tide/configure/choices/all/show_time.fish new file mode 100644 index 0000000..b66c785 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/show_time.fish @@ -0,0 +1,33 @@ +function show_time + _tide_title 'Show current time?' + + _tide_option 1 No + _tide_display_prompt + + set -a fake_tide_right_prompt_items time + + _tide_option 2 '24-hour format' + set -g fake_tide_time_format %T + _tide_display_prompt + + _tide_option 3 '12-hour format' + set -g fake_tide_time_format %r + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case No + set -g fake_tide_time_format '' + set -e fake_tide_right_prompt_items[-1] + case '24-hour format' + set -g fake_tide_time_format %T + case '12-hour format' + set -g fake_tide_time_format %r + end + switch $_tide_configure_style + case lean + _next_choice "$_tide_configure_style"/"$_tide_configure_style"_prompt_height + case classic rainbow + _next_choice "$_tide_configure_style"/"$_tide_configure_style"_prompt_separators + end +end diff --git a/home-config/fish/functions/tide/configure/choices/all/style.fish b/home-config/fish/functions/tide/configure/choices/all/style.fish new file mode 100644 index 0000000..fe9a58f --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/style.fish @@ -0,0 +1,36 @@ +function style + set -g _tide_configure_current_options + + _tide_title 'Prompt Style' + + _tide_option 1 Lean + _load_config lean + _tide_display_prompt + + _tide_option 2 Classic + _load_config classic + _tide_display_prompt + + _tide_option 3 Rainbow + _load_config rainbow + _tide_display_prompt + + _tide_menu (status function) --no-restart + switch $_tide_selected_option + case Lean + _load_config lean + set -g _tide_configure_style lean + case Classic + _load_config classic + set -g _tide_configure_style classic + case Rainbow + _load_config rainbow + set -g _tide_configure_style rainbow + end + _next_choice all/prompt_colors +end + +function _load_config -a name + string replace -r '^' 'set -g fake_' <(status dirname)/../../icons.fish | source + string replace -r '^' 'set -g fake_' <(status dirname)/../../configs/$name.fish | source +end diff --git a/home-config/fish/functions/tide/configure/choices/all/transient.fish b/home-config/fish/functions/tide/configure/choices/all/transient.fish new file mode 100644 index 0000000..df2b6b6 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/all/transient.fish @@ -0,0 +1,22 @@ +function transient + _tide_title 'Enable transient prompt?' + + _tide_option 1 No + _tide_display_prompt + _tide_display_prompt + _tide_display_prompt + + _tide_option 2 Yes + _configure_transient= _tide_display_prompt + _configure_transient= _tide_display_prompt + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case No + set fake_tide_prompt_transient_enabled false + case Yes + set fake_tide_prompt_transient_enabled true + end + _next_choice all/finish +end diff --git a/home-config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish b/home-config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish new file mode 100644 index 0000000..77ceeaf --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish @@ -0,0 +1,38 @@ +function classic_prompt_color + _tide_title 'Prompt Color' + + _tide_option 1 Lightest + _set_all_items_bg_color 585858 + _tide_display_prompt + + _tide_option 2 Light + _set_all_items_bg_color 444444 + _tide_display_prompt + + _tide_option 3 Dark + _set_all_items_bg_color 303030 + _tide_display_prompt + + _tide_option 4 Darkest + _set_all_items_bg_color 1C1C1C + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Lightest + _set_all_items_bg_color 585858 + case Light + _set_all_items_bg_color 444444 + case Dark + _set_all_items_bg_color 303030 + case Darkest + _set_all_items_bg_color 1C1C1C + end + _next_choice all/show_time +end + +function _set_all_items_bg_color -a color + for var in (set --names | string match -r "fake_.*_bg_color.*") + set $var $color + end +end diff --git a/home-config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish b/home-config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish new file mode 100644 index 0000000..20af6cd --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish @@ -0,0 +1,40 @@ +function classic_prompt_separators + _tide_title 'Prompt Separators' + + _tide_option 1 Angled + set -g fake_tide_left_prompt_separator_same_color  + set -g fake_tide_right_prompt_separator_same_color  + _tide_display_prompt + + _tide_option 2 Vertical + set -g fake_tide_left_prompt_separator_same_color │ + set -g fake_tide_right_prompt_separator_same_color │ + _tide_display_prompt + + _tide_option 3 Slanted + set -g fake_tide_left_prompt_separator_same_color ╱ + set -g fake_tide_right_prompt_separator_same_color ╱ + _tide_display_prompt + + _tide_option 4 Round + set -g fake_tide_left_prompt_separator_same_color  + set -g fake_tide_right_prompt_separator_same_color  + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Angled + set -g fake_tide_left_prompt_separator_same_color  + set -g fake_tide_right_prompt_separator_same_color  + case Vertical + set -g fake_tide_left_prompt_separator_same_color │ + set -g fake_tide_right_prompt_separator_same_color │ + case Slanted + set -g fake_tide_left_prompt_separator_same_color ╱ + set -g fake_tide_right_prompt_separator_same_color ╱ + case Round + set -g fake_tide_left_prompt_separator_same_color  + set -g fake_tide_right_prompt_separator_same_color  + end + _next_choice powerline/powerline_prompt_heads +end diff --git a/home-config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish b/home-config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish new file mode 100644 index 0000000..2077241 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish @@ -0,0 +1,26 @@ +function lean_prompt_height + _tide_title 'Prompt Height' + + _tide_option 1 'One line' + _tide_find_and_remove newline fake_tide_left_prompt_items + set -g fake_tide_left_prompt_suffix '' + _tide_display_prompt + + _tide_option 2 'Two lines' + set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] newline $fake_tide_left_prompt_items[-1] + set -g fake_tide_left_prompt_suffix ' ' + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case 'One line' + _tide_find_and_remove newline fake_tide_left_prompt_items + set fake_tide_left_prompt_suffix '' + _next_choice all/prompt_connection_andor_frame_color + case 'Two lines' + _tide_find_and_remove newline fake_tide_left_prompt_items + set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] newline $fake_tide_left_prompt_items[-1] + set -g fake_tide_left_prompt_suffix ' ' + _next_choice all/prompt_connection + end +end diff --git a/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish b/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish new file mode 100644 index 0000000..0030cad --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish @@ -0,0 +1,32 @@ +function powerline_prompt_heads + _tide_title 'Prompt Heads' + + _tide_option 1 Sharp + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + _tide_display_prompt + + _tide_option 2 Slanted + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + _tide_display_prompt + + _tide_option 3 Round + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Sharp + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + case Slanted + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + case Round + set -g fake_tide_left_prompt_suffix  + set -g fake_tide_right_prompt_prefix  + end + _next_choice powerline/powerline_prompt_tails +end diff --git a/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish b/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish new file mode 100644 index 0000000..b374757 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_style.fish @@ -0,0 +1,51 @@ +function powerline_prompt_style + _tide_title 'Powerline Prompt Style' + + _tide_option 1 'One line' + _tide_find_and_remove newline fake_tide_left_prompt_items + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _tide_display_prompt + + set -a fake_tide_left_prompt_items newline + + _tide_option 2 'Two lines, character' + set -a fake_tide_left_prompt_items character + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _tide_display_prompt + + _tide_option 3 'Two lines, frame' + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled true + set fake_tide_right_prompt_frame_enabled true + _tide_display_prompt + + _tide_option 4 'Two lines, character and frame' + set -a fake_tide_left_prompt_items character + set fake_tide_left_prompt_frame_enabled true + set fake_tide_right_prompt_frame_enabled true + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case 'One line' + _tide_find_and_remove newline fake_tide_left_prompt_items + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _next_choice all/prompt_connection_andor_frame_color + case 'Two lines, character' + set fake_tide_left_prompt_frame_enabled false + set fake_tide_right_prompt_frame_enabled false + _next_choice all/prompt_connection + case 'Two lines, frame' + _tide_find_and_remove character fake_tide_left_prompt_items + set fake_tide_left_prompt_frame_enabled true + set fake_tide_right_prompt_frame_enabled true + _next_choice all/prompt_connection + case 'Two lines, character and frame' + _next_choice all/prompt_connection + end +end diff --git a/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish b/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish new file mode 100644 index 0000000..6b1574b --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish @@ -0,0 +1,40 @@ +function powerline_prompt_tails + _tide_title 'Prompt Tails' + + _tide_option 1 Flat + set -g fake_tide_left_prompt_prefix '' + set -g fake_tide_right_prompt_suffix '' + _tide_display_prompt + + _tide_option 2 Sharp + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + _tide_display_prompt + + _tide_option 3 Slanted + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + _tide_display_prompt + + _tide_option 4 Round + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Flat + set -g fake_tide_left_prompt_prefix '' + set -g fake_tide_right_prompt_suffix '' + case Sharp + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + case Slanted + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + case Round + set -g fake_tide_left_prompt_prefix  + set -g fake_tide_right_prompt_suffix  + end + _next_choice powerline/powerline_prompt_style +end diff --git a/home-config/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish b/home-config/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish new file mode 100644 index 0000000..a2d0a5b --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/powerline/powerline_right_prompt_frame.fish @@ -0,0 +1,20 @@ +function powerline_right_prompt_frame + _tide_title 'Right Prompt Frame' + + _tide_option 1 No + set fake_tide_right_prompt_frame_enabled false + _tide_display_prompt + + _tide_option 2 Yes + set fake_tide_right_prompt_frame_enabled true + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case No + set fake_tide_right_prompt_frame_enabled false + case Yes + set fake_tide_right_prompt_frame_enabled true + end + _next_choice all/prompt_connection_andor_frame_color +end diff --git a/home-config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish b/home-config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish new file mode 100644 index 0000000..14b9319 --- /dev/null +++ b/home-config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish @@ -0,0 +1,40 @@ +function rainbow_prompt_separators + _tide_title 'Prompt Separators' + + _tide_option 1 Angled + set -g fake_tide_left_prompt_separator_diff_color  + set -g fake_tide_right_prompt_separator_diff_color  + _tide_display_prompt + + _tide_option 2 Vertical + set -g fake_tide_left_prompt_separator_diff_color '' + set -g fake_tide_right_prompt_separator_diff_color '' + _tide_display_prompt + + _tide_option 3 Slanted + set -g fake_tide_left_prompt_separator_diff_color '' + set -g fake_tide_right_prompt_separator_diff_color '' + _tide_display_prompt + + _tide_option 4 Round + set -g fake_tide_left_prompt_separator_diff_color '' + set -g fake_tide_right_prompt_separator_diff_color '' + _tide_display_prompt + + _tide_menu (status function) + switch $_tide_selected_option + case Angled + set -g fake_tide_left_prompt_separator_diff_color  + set -g fake_tide_right_prompt_separator_diff_color  + case Vertical + set -g fake_tide_left_prompt_separator_diff_color '' + set -g fake_tide_right_prompt_separator_diff_color '' + case Slanted + set -g fake_tide_left_prompt_separator_diff_color '' + set -g fake_tide_right_prompt_separator_diff_color '' + case Round + set -g fake_tide_left_prompt_separator_diff_color '' + set -g fake_tide_right_prompt_separator_diff_color '' + end + _next_choice powerline/powerline_prompt_heads +end diff --git a/home-config/fish/functions/tide/configure/configs/classic.fish b/home-config/fish/functions/tide/configure/configs/classic.fish new file mode 100644 index 0000000..8973cbc --- /dev/null +++ b/home-config/fish/functions/tide/configure/configs/classic.fish @@ -0,0 +1,116 @@ +tide_aws_bg_color 444444 +tide_aws_color FF9900 +tide_character_color $_tide_color_green +tide_character_color_failure FF0000 +tide_cmd_duration_bg_color 444444 +tide_cmd_duration_color 87875F +tide_cmd_duration_decimals 0 +tide_cmd_duration_threshold 3000 +tide_context_always_display false +tide_context_bg_color 444444 +tide_context_color_default D7AF87 +tide_context_color_root $_tide_color_gold +tide_context_color_ssh D7AF87 +tide_context_hostname_parts 1 +tide_crystal_bg_color 444444 +tide_crystal_color FFFFFF +tide_direnv_bg_color 444444 +tide_direnv_bg_color_denied 444444 +tide_direnv_color $_tide_color_gold +tide_direnv_color_denied FF0000 +tide_distrobox_bg_color 444444 +tide_distrobox_color FF00FF +tide_docker_bg_color 444444 +tide_docker_color 2496ED +tide_docker_default_contexts default colima +tide_elixir_bg_color 444444 +tide_elixir_color 4E2A8E +tide_gcloud_bg_color 444444 +tide_gcloud_color 4285F4 +tide_git_bg_color 444444 +tide_git_bg_color_unstable 444444 +tide_git_bg_color_urgent 444444 +tide_git_color_branch $_tide_color_green +tide_git_color_conflicted FF0000 +tide_git_color_dirty $_tide_color_gold +tide_git_color_operation FF0000 +tide_git_color_staged $_tide_color_gold +tide_git_color_stash $_tide_color_green +tide_git_color_untracked $_tide_color_light_blue +tide_git_color_upstream $_tide_color_green +tide_git_truncation_length 24 +tide_git_truncation_strategy +tide_go_bg_color 444444 +tide_go_color 00ACD7 +tide_java_bg_color 444444 +tide_java_color ED8B00 +tide_jobs_bg_color 444444 +tide_jobs_color $_tide_color_dark_green +tide_jobs_number_threshold 1000 +tide_kubectl_bg_color 444444 +tide_kubectl_color 326CE5 +tide_left_prompt_frame_enabled true +tide_left_prompt_items pwd git newline +tide_left_prompt_prefix '' +tide_left_prompt_separator_diff_color  +tide_left_prompt_separator_same_color  +tide_left_prompt_suffix  +tide_nix_shell_bg_color 444444 +tide_nix_shell_color 7EBAE4 +tide_node_bg_color 444444 +tide_node_color 44883E +tide_os_bg_color 444444 +tide_os_color EEEEEE +tide_php_bg_color 444444 +tide_php_color 617CBE +tide_private_mode_bg_color 444444 +tide_private_mode_color FFFFFF +tide_prompt_add_newline_before true +tide_prompt_color_frame_and_connection 6C6C6C +tide_prompt_color_separator_same_color 949494 +tide_prompt_min_cols 34 +tide_prompt_pad_items true +tide_prompt_transient_enabled false +tide_pulumi_bg_color 444444 +tide_pulumi_color F7BF2A +tide_pwd_bg_color 444444 +tide_pwd_color_anchors $_tide_color_light_blue +tide_pwd_color_dirs $_tide_color_dark_blue +tide_pwd_color_truncated_dirs 8787AF +tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json build.zig +tide_python_bg_color 444444 +tide_python_color 00AFAF +tide_right_prompt_frame_enabled true +tide_right_prompt_items status cmd_duration context jobs direnv node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir zig +tide_right_prompt_prefix  +tide_right_prompt_separator_diff_color  +tide_right_prompt_separator_same_color  +tide_right_prompt_suffix '' +tide_ruby_bg_color 444444 +tide_ruby_color B31209 +tide_rustc_bg_color 444444 +tide_rustc_color F74C00 +tide_shlvl_bg_color 444444 +tide_shlvl_color d78700 +tide_shlvl_threshold 1 +tide_status_bg_color 444444 +tide_status_bg_color_failure 444444 +tide_status_color $_tide_color_dark_green +tide_status_color_failure D70000 +tide_terraform_bg_color 444444 +tide_terraform_color 844FBA +tide_time_bg_color 444444 +tide_time_color 5F8787 +tide_time_format %T +tide_toolbox_bg_color 444444 +tide_toolbox_color 613583 +tide_vi_mode_bg_color_default 444444 +tide_vi_mode_bg_color_insert 444444 +tide_vi_mode_bg_color_replace 444444 +tide_vi_mode_bg_color_visual 444444 +tide_vi_mode_color_default 949494 +tide_vi_mode_color_insert 87AFAF +tide_vi_mode_color_replace 87AF87 +tide_vi_mode_color_visual FF8700 +tide_zig_bg_color 444444 +tide_zig_color F7A41D diff --git a/home-config/fish/functions/tide/configure/configs/classic_16color.fish b/home-config/fish/functions/tide/configure/configs/classic_16color.fish new file mode 100644 index 0000000..670170f --- /dev/null +++ b/home-config/fish/functions/tide/configure/configs/classic_16color.fish @@ -0,0 +1,89 @@ +tide_aws_bg_color black +tide_aws_color yellow +tide_character_color brgreen +tide_character_color_failure brred +tide_cmd_duration_bg_color black +tide_cmd_duration_color brblack +tide_context_bg_color black +tide_context_color_default yellow +tide_context_color_root bryellow +tide_context_color_ssh yellow +tide_crystal_bg_color black +tide_crystal_color brwhite +tide_direnv_bg_color black +tide_direnv_bg_color_denied black +tide_direnv_color bryellow +tide_direnv_color_denied brred +tide_distrobox_bg_color black +tide_distrobox_color brmagenta +tide_docker_bg_color black +tide_docker_color blue +tide_elixir_bg_color black +tide_elixir_color magenta +tide_gcloud_bg_color black +tide_gcloud_color blue +tide_git_bg_color black +tide_git_bg_color_unstable black +tide_git_bg_color_urgent black +tide_git_color_branch brgreen +tide_git_color_conflicted brred +tide_git_color_dirty bryellow +tide_git_color_operation brred +tide_git_color_staged bryellow +tide_git_color_stash brgreen +tide_git_color_untracked brblue +tide_git_color_upstream brgreen +tide_go_bg_color black +tide_go_color brcyan +tide_java_bg_color black +tide_java_color yellow +tide_jobs_bg_color black +tide_jobs_color green +tide_kubectl_bg_color black +tide_kubectl_color blue +tide_nix_shell_bg_color black +tide_nix_shell_color brblue +tide_node_bg_color black +tide_node_color green +tide_os_bg_color black +tide_os_color brwhite +tide_php_bg_color black +tide_php_color blue +tide_private_mode_bg_color black +tide_private_mode_color brwhite +tide_prompt_color_frame_and_connection brblack +tide_prompt_color_separator_same_color brblack +tide_pulumi_bg_color black +tide_pulumi_color yellow +tide_pwd_bg_color black +tide_pwd_color_anchors brcyan +tide_pwd_color_dirs cyan +tide_pwd_color_truncated_dirs magenta +tide_python_bg_color black +tide_python_color cyan +tide_ruby_bg_color black +tide_ruby_color red +tide_rustc_bg_color black +tide_rustc_color red +tide_shlvl_bg_color black +tide_shlvl_color yellow +tide_status_bg_color black +tide_status_bg_color_failure black +tide_status_color green +tide_status_color_failure red +tide_terraform_bg_color black +tide_terraform_color magenta +tide_time_bg_color black +tide_time_color brblack +tide_toolbox_bg_color black +tide_toolbox_color magenta +tide_vi_mode_bg_color_default black +tide_vi_mode_bg_color_insert black +tide_vi_mode_bg_color_replace black +tide_vi_mode_bg_color_visual black +tide_vi_mode_color_default white +tide_vi_mode_color_insert cyan +tide_vi_mode_color_replace green +tide_vi_mode_color_visual yellow +tide_zig_bg_color black +tide_zig_color yellow diff --git a/home-config/fish/functions/tide/configure/configs/lean.fish b/home-config/fish/functions/tide/configure/configs/lean.fish new file mode 100644 index 0000000..a958a17 --- /dev/null +++ b/home-config/fish/functions/tide/configure/configs/lean.fish @@ -0,0 +1,116 @@ +tide_aws_bg_color normal +tide_aws_color FF9900 +tide_character_color $_tide_color_green +tide_character_color_failure FF0000 +tide_cmd_duration_bg_color normal +tide_cmd_duration_color 87875F +tide_cmd_duration_decimals 0 +tide_cmd_duration_threshold 3000 +tide_context_always_display false +tide_context_bg_color normal +tide_context_color_default D7AF87 +tide_context_color_root $_tide_color_gold +tide_context_color_ssh D7AF87 +tide_context_hostname_parts 1 +tide_crystal_bg_color normal +tide_crystal_color FFFFFF +tide_direnv_bg_color normal +tide_direnv_bg_color_denied normal +tide_direnv_color $_tide_color_gold +tide_direnv_color_denied FF0000 +tide_distrobox_bg_color normal +tide_distrobox_color FF00FF +tide_docker_bg_color normal +tide_docker_color 2496ED +tide_docker_default_contexts default colima +tide_elixir_bg_color normal +tide_elixir_color 4E2A8E +tide_gcloud_bg_color normal +tide_gcloud_color 4285F4 +tide_git_bg_color normal +tide_git_bg_color_unstable normal +tide_git_bg_color_urgent normal +tide_git_color_branch $_tide_color_green +tide_git_color_conflicted FF0000 +tide_git_color_dirty $_tide_color_gold +tide_git_color_operation FF0000 +tide_git_color_staged $_tide_color_gold +tide_git_color_stash $_tide_color_green +tide_git_color_untracked $_tide_color_light_blue +tide_git_color_upstream $_tide_color_green +tide_git_truncation_length 24 +tide_git_truncation_strategy +tide_go_bg_color normal +tide_go_color 00ACD7 +tide_java_bg_color normal +tide_java_color ED8B00 +tide_jobs_bg_color normal +tide_jobs_color $_tide_color_dark_green +tide_jobs_number_threshold 1000 +tide_kubectl_bg_color normal +tide_kubectl_color 326CE5 +tide_left_prompt_frame_enabled false +tide_left_prompt_items pwd git newline character +tide_left_prompt_prefix '' +tide_left_prompt_separator_diff_color ' ' +tide_left_prompt_separator_same_color ' ' +tide_left_prompt_suffix ' ' +tide_nix_shell_bg_color normal +tide_nix_shell_color 7EBAE4 +tide_node_bg_color normal +tide_node_color 44883E +tide_os_bg_color normal +tide_os_color normal +tide_php_bg_color normal +tide_php_color 617CBE +tide_private_mode_bg_color normal +tide_private_mode_color FFFFFF +tide_prompt_add_newline_before true +tide_prompt_color_frame_and_connection 6C6C6C +tide_prompt_color_separator_same_color 949494 +tide_prompt_min_cols 34 +tide_prompt_pad_items false +tide_prompt_transient_enabled false +tide_pulumi_bg_color normal +tide_pulumi_color F7BF2A +tide_pwd_bg_color normal +tide_pwd_color_anchors $_tide_color_light_blue +tide_pwd_color_dirs $_tide_color_dark_blue +tide_pwd_color_truncated_dirs 8787AF +tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json build.zig +tide_python_bg_color normal +tide_python_color 00AFAF +tide_right_prompt_frame_enabled false +tide_right_prompt_items status cmd_duration context jobs direnv node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir zig +tide_right_prompt_prefix ' ' +tide_right_prompt_separator_diff_color ' ' +tide_right_prompt_separator_same_color ' ' +tide_right_prompt_suffix '' +tide_ruby_bg_color normal +tide_ruby_color B31209 +tide_rustc_bg_color normal +tide_rustc_color F74C00 +tide_shlvl_bg_color normal +tide_shlvl_color d78700 +tide_shlvl_threshold 1 +tide_status_bg_color normal +tide_status_bg_color_failure normal +tide_status_color $_tide_color_dark_green +tide_status_color_failure D70000 +tide_terraform_bg_color normal +tide_terraform_color 844FBA +tide_time_bg_color normal +tide_time_color 5F8787 +tide_time_format %T +tide_toolbox_bg_color normal +tide_toolbox_color 613583 +tide_vi_mode_bg_color_default normal +tide_vi_mode_bg_color_insert normal +tide_vi_mode_bg_color_replace normal +tide_vi_mode_bg_color_visual normal +tide_vi_mode_color_default 949494 +tide_vi_mode_color_insert 87AFAF +tide_vi_mode_color_replace 87AF87 +tide_vi_mode_color_visual FF8700 +tide_zig_bg_color normal +tide_zig_color F7A41D diff --git a/home-config/fish/functions/tide/configure/configs/lean_16color.fish b/home-config/fish/functions/tide/configure/configs/lean_16color.fish new file mode 100644 index 0000000..16c2511 --- /dev/null +++ b/home-config/fish/functions/tide/configure/configs/lean_16color.fish @@ -0,0 +1,89 @@ +tide_aws_bg_color normal +tide_aws_color yellow +tide_character_color brgreen +tide_character_color_failure brred +tide_cmd_duration_bg_color normal +tide_cmd_duration_color brblack +tide_context_bg_color normal +tide_context_color_default yellow +tide_context_color_root bryellow +tide_context_color_ssh yellow +tide_crystal_bg_color normal +tide_crystal_color brwhite +tide_direnv_bg_color normal +tide_direnv_bg_color_denied normal +tide_direnv_color bryellow +tide_direnv_color_denied brred +tide_distrobox_bg_color normal +tide_distrobox_color brmagenta +tide_docker_bg_color normal +tide_docker_color blue +tide_elixir_bg_color normal +tide_elixir_color magenta +tide_gcloud_bg_color normal +tide_gcloud_color blue +tide_git_bg_color normal +tide_git_bg_color_unstable normal +tide_git_bg_color_urgent normal +tide_git_color_branch brgreen +tide_git_color_conflicted brred +tide_git_color_dirty bryellow +tide_git_color_operation brred +tide_git_color_staged bryellow +tide_git_color_stash brgreen +tide_git_color_untracked brblue +tide_git_color_upstream brgreen +tide_go_bg_color normal +tide_go_color brcyan +tide_java_bg_color normal +tide_java_color yellow +tide_jobs_bg_color normal +tide_jobs_color green +tide_kubectl_bg_color normal +tide_kubectl_color blue +tide_nix_shell_bg_color normal +tide_nix_shell_color brblue +tide_node_bg_color normal +tide_node_color green +tide_os_bg_color normal +tide_os_color brwhite +tide_php_bg_color normal +tide_php_color blue +tide_private_mode_bg_color normal +tide_private_mode_color brwhite +tide_prompt_color_frame_and_connection brblack +tide_prompt_color_separator_same_color brblack +tide_pulumi_bg_color normal +tide_pulumi_color yellow +tide_pwd_bg_color normal +tide_pwd_color_anchors brcyan +tide_pwd_color_dirs cyan +tide_pwd_color_truncated_dirs magenta +tide_python_bg_color normal +tide_python_color cyan +tide_ruby_bg_color normal +tide_ruby_color red +tide_rustc_bg_color normal +tide_rustc_color red +tide_shlvl_bg_color normal +tide_shlvl_color yellow +tide_status_bg_color normal +tide_status_bg_color_failure normal +tide_status_color green +tide_status_color_failure red +tide_terraform_bg_color normal +tide_terraform_color magenta +tide_time_bg_color normal +tide_time_color brblack +tide_toolbox_bg_color normal +tide_toolbox_color magenta +tide_vi_mode_bg_color_default normal +tide_vi_mode_bg_color_insert normal +tide_vi_mode_bg_color_replace normal +tide_vi_mode_bg_color_visual normal +tide_vi_mode_color_default white +tide_vi_mode_color_insert cyan +tide_vi_mode_color_replace green +tide_vi_mode_color_visual yellow +tide_zig_bg_color normal +tide_zig_color yellow diff --git a/home-config/fish/functions/tide/configure/configs/rainbow.fish b/home-config/fish/functions/tide/configure/configs/rainbow.fish new file mode 100644 index 0000000..60c1592 --- /dev/null +++ b/home-config/fish/functions/tide/configure/configs/rainbow.fish @@ -0,0 +1,116 @@ +tide_aws_bg_color FF9900 +tide_aws_color 232F3E +tide_character_color $_tide_color_green +tide_character_color_failure FF0000 +tide_cmd_duration_bg_color C4A000 +tide_cmd_duration_color 000000 +tide_cmd_duration_decimals 0 +tide_cmd_duration_threshold 3000 +tide_context_always_display false +tide_context_bg_color 444444 +tide_context_color_default D7AF87 +tide_context_color_root $_tide_color_gold +tide_context_color_ssh D7AF87 +tide_context_hostname_parts 1 +tide_crystal_bg_color FFFFFF +tide_crystal_color 000000 +tide_direnv_bg_color $_tide_color_gold +tide_direnv_bg_color_denied FF0000 +tide_direnv_color 000000 +tide_direnv_color_denied 000000 +tide_distrobox_bg_color FF00FF +tide_distrobox_color 000000 +tide_docker_bg_color 2496ED +tide_docker_color 000000 +tide_docker_default_contexts default colima +tide_elixir_bg_color 4E2A8E +tide_elixir_color 000000 +tide_gcloud_bg_color 4285F4 +tide_gcloud_color 000000 +tide_git_bg_color 4E9A06 +tide_git_bg_color_unstable C4A000 +tide_git_bg_color_urgent CC0000 +tide_git_color_branch 000000 +tide_git_color_conflicted 000000 +tide_git_color_dirty 000000 +tide_git_color_operation 000000 +tide_git_color_staged 000000 +tide_git_color_stash 000000 +tide_git_color_untracked 000000 +tide_git_color_upstream 000000 +tide_git_truncation_length 24 +tide_git_truncation_strategy +tide_go_bg_color 00ACD7 +tide_go_color 000000 +tide_java_bg_color ED8B00 +tide_java_color 000000 +tide_jobs_bg_color 444444 +tide_jobs_color 4E9A06 +tide_jobs_number_threshold 1000 +tide_kubectl_bg_color 326CE5 +tide_kubectl_color 000000 +tide_left_prompt_frame_enabled true +tide_left_prompt_items pwd git newline +tide_left_prompt_prefix '' +tide_left_prompt_separator_diff_color  +tide_left_prompt_separator_same_color  +tide_left_prompt_suffix  +tide_nix_shell_bg_color 7EBAE4 +tide_nix_shell_color 000000 +tide_node_bg_color 44883E +tide_node_color 000000 +tide_os_bg_color $os_branding_bg_color +tide_os_color $os_branding_color +tide_php_bg_color 617CBE +tide_php_color 000000 +tide_private_mode_bg_color F1F3F4 +tide_private_mode_color 000000 +tide_prompt_add_newline_before true +tide_prompt_color_frame_and_connection 6C6C6C +tide_prompt_color_separator_same_color 949494 +tide_prompt_min_cols 34 +tide_prompt_pad_items true +tide_prompt_transient_enabled false +tide_pulumi_bg_color F7BF2A +tide_pulumi_color 000000 +tide_pwd_bg_color 3465A4 +tide_pwd_color_anchors E4E4E4 +tide_pwd_color_dirs E4E4E4 +tide_pwd_color_truncated_dirs BCBCBC +tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json build.zig +tide_python_bg_color 444444 +tide_python_color 00AFAF +tide_right_prompt_frame_enabled true +tide_right_prompt_items status cmd_duration context jobs direnv node python rustc java php pulumi ruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir zig +tide_right_prompt_prefix  +tide_right_prompt_separator_diff_color  +tide_right_prompt_separator_same_color  +tide_right_prompt_suffix '' +tide_ruby_bg_color B31209 +tide_ruby_color 000000 +tide_rustc_bg_color F74C00 +tide_rustc_color 000000 +tide_shlvl_bg_color 808000 +tide_shlvl_color 000000 +tide_shlvl_threshold 1 +tide_status_bg_color 2E3436 +tide_status_bg_color_failure CC0000 +tide_status_color 4E9A06 +tide_status_color_failure FFFF00 +tide_terraform_bg_color 800080 +tide_terraform_color 000000 +tide_time_bg_color D3D7CF +tide_time_color 000000 +tide_time_format %T +tide_toolbox_bg_color 613583 +tide_toolbox_color 000000 +tide_vi_mode_bg_color_default 949494 +tide_vi_mode_bg_color_insert 87AFAF +tide_vi_mode_bg_color_replace 87AF87 +tide_vi_mode_bg_color_visual FF8700 +tide_vi_mode_color_default 000000 +tide_vi_mode_color_insert 000000 +tide_vi_mode_color_replace 000000 +tide_vi_mode_color_visual 000000 +tide_zig_bg_color F7A41D +tide_zig_color 000000 diff --git a/home-config/fish/functions/tide/configure/configs/rainbow_16color.fish b/home-config/fish/functions/tide/configure/configs/rainbow_16color.fish new file mode 100644 index 0000000..a040f58 --- /dev/null +++ b/home-config/fish/functions/tide/configure/configs/rainbow_16color.fish @@ -0,0 +1,93 @@ +tide_aws_bg_color yellow +tide_aws_color brblack +tide_character_color brgreen +tide_character_color_failure brred +tide_cmd_duration_bg_color yellow +tide_cmd_duration_color black +tide_context_bg_color brblack +tide_context_color_default yellow +tide_context_color_root yellow +tide_context_color_ssh yellow +tide_crystal_bg_color brwhite +tide_crystal_color black +tide_direnv_bg_color bryellow +tide_direnv_bg_color_denied brred +tide_direnv_color black +tide_direnv_color_denied black +tide_distrobox_bg_color brmagenta +tide_distrobox_color black +tide_docker_bg_color blue +tide_docker_color black +tide_elixir_bg_color magenta +tide_elixir_color black +tide_gcloud_bg_color blue +tide_gcloud_color black +tide_git_bg_color green +tide_git_bg_color_unstable yellow +tide_git_bg_color_urgent red +tide_git_color_branch black +tide_git_color_conflicted black +tide_git_color_dirty black +tide_git_color_operation black +tide_git_color_staged black +tide_git_color_stash black +tide_git_color_untracked black +tide_git_color_upstream black +tide_go_bg_color brcyan +tide_go_color black +tide_java_bg_color yellow +tide_java_color black +tide_jobs_bg_color brblack +tide_jobs_color green +tide_kubectl_bg_color blue +tide_kubectl_color black +tide_nix_shell_bg_color brblue +tide_nix_shell_color black +tide_node_bg_color green +tide_node_color black +tide_os_bg_color white +tide_os_color black +tide_php_bg_color blue +tide_php_color black +tide_private_mode_bg_color brwhite +tide_private_mode_color black +tide_prompt_color_frame_and_connection brblack +tide_prompt_color_separator_same_color brblack +tide_pulumi_bg_color yellow +tide_pulumi_color black +tide_pwd_bg_color blue +tide_pwd_color_anchors brwhite +tide_pwd_color_dirs brwhite +tide_pwd_color_truncated_dirs white +tide_python_bg_color brblack +tide_python_color cyan +tide_ruby_bg_color red +tide_ruby_color black +tide_rustc_bg_color red +tide_rustc_color black +tide_shlvl_bg_color yellow +tide_shlvl_color black +tide_status_bg_color black +tide_status_bg_color_failure red +tide_status_color green +tide_status_color_failure bryellow +tide_terraform_bg_color magenta +tide_terraform_color black +tide_time_bg_color white +tide_time_color black +tide_toolbox_bg_color magenta +tide_toolbox_color black +tide_vi_mode_bg_color_default white +tide_vi_mode_bg_color_insert cyan +tide_vi_mode_bg_color_replace green +tide_vi_mode_bg_color_visual yellow +tide_vi_mode_color_default black +tide_vi_mode_color_insert black +tide_vi_mode_color_replace black +tide_vi_mode_color_visual black +tide_vi_mode_icon_default D +tide_vi_mode_icon_insert I +tide_vi_mode_icon_replace R +tide_vi_mode_icon_visual V +tide_zig_bg_color yellow +tide_zig_color black diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish new file mode 100644 index 0000000..4661ab1 --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish @@ -0,0 +1,41 @@ +function _fake_tide_cache_variables + # pwd + set_color -o $fake_tide_pwd_color_anchors | read -gx _fake_tide_color_anchors + set -gx _fake_tide_color_truncated_dirs "$(set_color $fake_tide_pwd_color_truncated_dirs)" + set -gx _fake_tide_reset_to_color_dirs (set_color normal -b $fake_tide_pwd_bg_color; set_color $fake_tide_pwd_color_dirs) + + # git + contains git $fake_tide_left_prompt_items $fake_tide_right_prompt_items && + set -gx _fake_tide_location_color "$(set_color $fake_tide_git_color_branch)" + + # private_mode + if contains private_mode $fake_tide_left_prompt_items $fake_tide_right_prompt_items && test -n "$fish_private_mode" + set -gx _fake_tide_private_mode + else + set -e _fake_tide_private_mode + end + + # Same-color-separator color + set -gx _fake_tide_color_separator_same_color "$(set_color $fake_tide_prompt_color_separator_same_color)" + + # two line prompt + if contains newline $fake_tide_left_prompt_items + set_color $fake_tide_prompt_color_frame_and_connection -b normal | read -gx _fake_tide_prompt_and_frame_color + else + set -e _fake_tide_prompt_and_frame_color + end + + # newline before + if test "$fake_tide_prompt_add_newline_before" = true + set -g _fake_tide_add_newline '' + else + set -e _fake_tide_add_newline + end + + # item padding + if test "$fake_tide_prompt_pad_items" = true + set -gx _fake_tide_pad ' ' + else + set -e _fake_tide_pad + end +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish new file mode 100644 index 0000000..94892ec --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish @@ -0,0 +1,8 @@ +function _fake_tide_item_character + set_color $fake_tide_character_color + if contains newline $fake_tide_left_prompt_items || set -q _configure_transient + echo -ns $fake_tide_character_icon + else + echo -ns ' '$fake_tide_character_icon + end +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish new file mode 100644 index 0000000..5aa13b2 --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish @@ -0,0 +1,3 @@ +function _fake_tide_item_cmd_duration + _fake_tide_print_item cmd_duration $fake_tide_cmd_duration_icon' ' 5s +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish new file mode 100644 index 0000000..fb5b957 --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish @@ -0,0 +1,3 @@ +function _fake_tide_item_git + _fake_tide_print_item git (set_color $fake_tide_git_color_branch) $fake_tide_git_icon' ' main +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish new file mode 100644 index 0000000..c614bab --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish @@ -0,0 +1,5 @@ +function _fake_tide_item_newline + set_color $prev_bg_color -b normal + var=fake_tide_"$_fake_tide_side"_prompt_suffix echo $$var + set -g add_prefix +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish new file mode 100644 index 0000000..5255721 --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish @@ -0,0 +1,3 @@ +function _fake_tide_item_os + _fake_tide_print_item os $fake_tide_os_icon +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish new file mode 100644 index 0000000..bbce0b5 --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish @@ -0,0 +1,3 @@ +function _fake_tide_item_time + _fake_tide_print_item time (date +$fake_tide_time_format) +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish new file mode 100644 index 0000000..30cd024 --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish @@ -0,0 +1,22 @@ +function _fake_tide_print_item -a item + var=fake_tide_"$item"_bg_color set -f item_bg_color $$var + + if set -e add_prefix + set_color $item_bg_color -b normal + var=fake_tide_"$_fake_tide_side"_prompt_prefix echo -ns $$var + else if test "$item_bg_color" = "$prev_bg_color" + var=fake_tide_"$_fake_tide_side"_prompt_separator_same_color echo -ns $_fake_tide_color_separator_same_color$$var + else if test "$_fake_tide_side" = left + set_color $prev_bg_color -b $item_bg_color + echo -ns $fake_tide_left_prompt_separator_diff_color + else + set_color $item_bg_color -b $prev_bg_color + echo -ns $fake_tide_right_prompt_separator_diff_color + end + + var=fake_tide_"$item"_color set_color $$var -b $item_bg_color + + echo -ns $_fake_tide_pad $argv[2..] $_fake_tide_pad + + set -g prev_bg_color $item_bg_color +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish new file mode 100644 index 0000000..11f20ca --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish @@ -0,0 +1,42 @@ +function _fake_tide_prompt + set -g add_prefix + _fake_tide_side=left set -f left (for item in $fake_tide_left_prompt_items + _fake_tide_item_$item + end + if not set -e add_prefix + set_color $prev_bg_color -b normal + echo -ns $fake_tide_left_prompt_suffix + end) + + set -g add_prefix + _fake_tide_side=right set -f right (for item in $fake_tide_right_prompt_items + _fake_tide_item_$item + end + if not set -e add_prefix + set_color $prev_bg_color -b normal + echo -ns $fake_tide_right_prompt_suffix + end) + + if set -q _fake_tide_prompt_and_frame_color # If prompt is two lines + test "$fake_tide_left_prompt_frame_enabled" = true && + set left[1] "$_fake_tide_prompt_and_frame_color╭─$left[1]" && + set left[2] "$_fake_tide_prompt_and_frame_color╰─$left[2]" + test "$fake_tide_right_prompt_frame_enabled" = true && + set right[1] "$right[1]$_fake_tide_prompt_and_frame_color─╮" && + set right[2] "$right[2]$_fake_tide_prompt_and_frame_color─╯" + + # 5 = @PWD@ length which will be replaced + math $fake_columns+5-(string length --visible "$left[1]$right[1]") | read -lx dist_btwn_sides + echo -ns "$right[2]"\n(string replace @PWD@ (_fake_tide_pwd) "$left[1]")$_fake_tide_prompt_and_frame_color + + string repeat --no-newline --max (math max 0, $dist_btwn_sides-$_tide_pwd_len) $fake_tide_prompt_icon_connection + echo -ns "$right[1]"\n"$left[2] " + else + math $fake_columns+5-(string length --visible "$left[1]$right[1]") -$fake_tide_prompt_min_cols | read -lx dist_btwn_sides + string replace @PWD@ (_fake_tide_pwd) "$right[1]" "$left[1] " + end +end + +function _fake_tide_item_pwd + _fake_tide_print_item pwd @PWD@ +end diff --git a/home-config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish b/home-config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish new file mode 100644 index 0000000..433eafa --- /dev/null +++ b/home-config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish @@ -0,0 +1,11 @@ +function _fake_tide_pwd + set -l out ( + set_color $fake_tide_pwd_color_dirs + echo -ns $fake_tide_pwd_icon' ' '~/' + set_color -o $fake_tide_pwd_color_anchors + echo -ns src + set_color normal -b $fake_tide_pwd_bg_color + ) + set -g _tide_pwd_len (string length --visible $out) + echo -ns $out +end diff --git a/home-config/fish/functions/tide/configure/icons.fish b/home-config/fish/functions/tide/configure/icons.fish new file mode 100644 index 0000000..70611cd --- /dev/null +++ b/home-config/fish/functions/tide/configure/icons.fish @@ -0,0 +1,40 @@ +tide_aws_icon  # Actual aws glyph is harder to see +tide_character_icon ❯ +tide_character_vi_icon_default ❮ +tide_character_vi_icon_replace ▶ +tide_character_vi_icon_visual V +tide_cmd_duration_icon +tide_crystal_icon  +tide_direnv_icon ▼ +tide_distrobox_icon 󰆧 +tide_docker_icon  +tide_elixir_icon  +tide_gcloud_icon 󰊭 # Actual google cloud glyph is harder to see +tide_git_icon +tide_go_icon  +tide_java_icon  +tide_jobs_icon  +tide_kubectl_icon 󱃾 +tide_nix_shell_icon  +tide_node_icon  # Actual nodejs glyph is harder to see +tide_os_icon $os_branding_icon +tide_php_icon  +tide_private_mode_icon 󰗹 +tide_prompt_icon_connection ' ' +tide_pulumi_icon  +tide_pwd_icon +tide_pwd_icon_home +tide_pwd_icon_unwritable  +tide_python_icon 󰌠 +tide_ruby_icon  +tide_rustc_icon  +tide_shlvl_icon  +tide_status_icon ✔ +tide_status_icon_failure ✘ +tide_terraform_icon 󱁢 +tide_toolbox_icon  +tide_vi_mode_icon_default D +tide_vi_mode_icon_insert I +tide_vi_mode_icon_replace R +tide_vi_mode_icon_visual V +tide_zig_icon  diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 06b3d96..4dac5b1 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -34,6 +34,8 @@ ;; Below is the list of packages that will show up in your ;; Home profile, under ~/.guix-home/profile. (packages (append (specifications->packages (list "bat" + "fd" + "fish" "xdg-utils" "abook" "libnotify" @@ -138,6 +140,10 @@ ("sway" ,(local-file "sway" #:recursive? #t)) ("hypr" ,(local-file "hypr" #:recursive? #t)) ("foot" ,(local-file "foot" #:recursive? #t)) + ("fish/completions" ,(local-file "fish/completions" #:recursive? #t)) + ("fish/conf.d" ,(local-file "fish/conf.d" #:recursive? #t)) + ("fish/fish_plugins" ,(local-file "fish/fish_plugins")) + ("fish/functions" ,(local-file "fish/functions" #:recursive? #t)) ("pulse/client.conf" ,(local-file "pulseaudio/client.conf")) ("waybar" ,(local-file "waybar" #:recursive? #t)) ("alacritty" ,(local-file "alacritty" #:recursive? #t)) diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm index fe41181..647a0bf 100644 --- a/modules/ryan-config/base-system.scm +++ b/modules/ryan-config/base-system.scm @@ -112,7 +112,7 @@ (name "ryan") (comment "Ryan") (group "users") - ;(shell (file-append zsh "/bin/zsh")) + ;(shell (file-append fish "/bin/fish")) (home-directory "/home/ryan") (supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker" "libvirt" "kvm" "dialout"))) %base-user-accounts)) @@ -121,7 +121,7 @@ ;; under their own account: use 'guix search KEYWORD' to search ;; for packages and 'guix install PACKAGE' to install a package. (packages (append (map specification->package (list "sway" - ;"hyprland" + "hyprland" "swaybg" ;"swayidle" ;"swaylock-effects" @@ -159,7 +159,7 @@ "wireplumber" "wireshark" "zsh")) - (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland-ryan hyprland-temp virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new) + (list my-ca-certs swaylock-effects-new waybar-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new) %my-base-packages )) ;; Below is the list of system services. To search for available diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm index 1f1a5e2..be24289 100644 --- a/modules/ryan-packages/wm.scm +++ b/modules/ryan-packages/wm.scm @@ -5,12 +5,17 @@ #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (guix build-system cmake) + #:use-module (guix build-system meson) #:use-module (gnu packages python) #:use-module (gnu packages audio) #:use-module (gnu packages glib) #:use-module (gnu packages freedesktop) #:use-module (gnu packages pkg-config) #:use-module (gnu packages gtk) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xorg) + #:use-module (gnu packages linux) + #:use-module (gnu packages gl) #:use-module (gnu packages llvm) #:use-module (gnu packages gcc) #:use-module (gnu packages check) @@ -52,7 +57,7 @@ (package (inherit waybar) (name "waybar-new") - (version "0.9.22") + (version "0.10.0") (source (origin (method git-fetch) @@ -61,44 +66,98 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0flwxg9rd7a2ygjvyksxxhxyyhp760jzd5ngkx65y77bxh1l7cpl")))) + (base32 "00a8npilvcvicn9mff00i5rdzdll0zrmq0y8wgr314gnljn52md7")))) (arguments (list #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true"))) (inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))))) ;(prepend python cava catch2 gtkmm))))) ;(native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13))))) -(define hyprland-unbundle-wlroots-patch - (origin - (method url-fetch) - (uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/" - "13f6f0b923ff3ec94a3bec886c28b90402ceef91" - "/nix/patches/meson-build.patch")) - (sha256 - (base32 "02sq5ymxxrxp93mccafc4ilpsvs4m8bxc3whp7bcc5v9dx41va8k")))) - -(define-public hyprland-temp +(define cairo-hypr ;;; stolen from rosenthal since it is not exported (package - (inherit hyprland) - (version "12985fa0d8e43b1e33326dfb49be681970dfaea5") + (inherit cairo) + (name "cairo") + (version "1.18.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hyprwm/Hyprland") - (commit version))) - (file-name (git-file-name "hyprland" version)) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "meson.build" - ((".*hyprpm/src.*") "")) - (for-each delete-file-recursively - '("hyprpm" - "subprojects")) - (copy-file "src/version.h.in" "src/version.h"))) + (method url-fetch) + (uri (string-append "https://cairographics.org/releases/cairo-" + version ".tar.xz")) (sha256 - (base32 - "13l95h5krmv7syidw9c4gn62ac5qcqg9pmfh6x8ydjws97h05jvz")) - (patches (list hyprland-unbundle-wlroots-patch)))))) + (base32 + "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4")))) + (build-system meson-build-system) + (arguments + (list #:tests? #f + #:glib-or-gtk? #t + #:configure-flags + #~(list "-Dspectre=disabled"))) + (outputs '("out")))) -swayidle-new + +(define-public hyprlock + (package + (name "hyprlock") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hyprwm/hyprlock") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vj8jfflc8zw769dqdqq7ms3dfafsirb2c0g37xsqkc4rzzri7nn")))) + (build-system cmake-build-system) + (native-inputs + (list gcc-13 + pkg-config + mesa-headers + wayland)) + (inputs + (list cairo + pango + libxkbcommon + hyprlang + mesa + wayland-protocols + linux-pam)) + (home-page "https://github.com/hyprwm/hyprlock") + (license license:bsd-3) + (synopsis "Screen locker for Hyprland") + (description "Screen locker for hyprland."))) + + +;(define hyprland-unbundle-wlroots-patch +; (origin +; (method url-fetch) +; (uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/" +; "13f6f0b923ff3ec94a3bec886c28b90402ceef91" +; "/nix/patches/meson-build.patch")) +; (sha256 +; (base32 "02sq5ymxxrxp93mccafc4ilpsvs4m8bxc3whp7bcc5v9dx41va8k")))) + +;(define-public hyprland-temp +; (package +; (inherit hyprland) +; (version "12985fa0d8e43b1e33326dfb49be681970dfaea5") +; (source (origin +; (method git-fetch) +; (uri (git-reference +; (url "https://github.com/hyprwm/Hyprland") +; (commit version))) +; (file-name (git-file-name "hyprland" version)) +; (modules '((guix build utils))) +; (snippet +; '(begin +; (substitute* "meson.build" +; ((".*hyprpm/src.*") "")) +; (for-each delete-file-recursively +; '("hyprpm" +; "subprojects")) +; (copy-file "src/version.h.in" "src/version.h"))) +; (sha256 +; (base32 +; "13l95h5krmv7syidw9c4gn62ac5qcqg9pmfh6x8ydjws97h05jvz")) +; (patches (list hyprland-unbundle-wlroots-patch)))))) + +hyprlock diff --git a/modules/ryan-services/udev.bak b/modules/ryan-services/udev.bak new file mode 100644 index 0000000..5a304d3 --- /dev/null +++ b/modules/ryan-services/udev.bak @@ -0,0 +1,17 @@ +(define-module (ryan-services udev) + #:use-module (gnu packages) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (guix gexp) + #:export (udev-hwdb-configuration + udev-hwdb-configuration? + udev-hwdb-configuration-rule)) + +(define-record-type* + udev-hwdb-configuration make-udev-hwdb-configuration + udev-hwdb-configuration? this-udev-hwdb-configuration + (hwdb-rules udev-hwdb-configuration-hwdb-rules ;list of file-like + (default '()))) + +; TODO: define hwdb rules like udev rules, add compiler step, splice this config +; into udev service proper, hopefully etc-config handles this gracefully