From fb7afd8a49678a80d360ebffff5b023dcac09005 Mon Sep 17 00:00:00 2001 From: "kujiu (@uberwald)" Date: Mon, 4 Sep 2023 16:14:08 +0200 Subject: [PATCH] Fish prompt with nightfox colors --- common/.config/fish/completions/tide.fish | 12 -- common/.config/fish/conf.d/_tide_init.fish | 41 ---- common/.config/fish/config.fish | 2 +- common/.config/fish/fish_variables | 154 -------------- .../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 | 75 ------- .../fish/functions/_tide_find_and_remove.fish | 3 - .../fish/functions/_tide_item_aws.fish | 11 - .../fish/functions/_tide_item_character.fish | 17 -- .../fish/functions/_tide_item_chruby.fish | 3 - .../functions/_tide_item_cmd_duration.fish | 12 -- .../fish/functions/_tide_item_context.fish | 15 -- .../fish/functions/_tide_item_crystal.fish | 4 - .../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 | 67 ------ .../.config/fish/functions/_tide_item_go.fish | 4 - .../fish/functions/_tide_item_java.fish | 4 - .../fish/functions/_tide_item_jobs.fish | 3 - .../fish/functions/_tide_item_kubectl.fish | 4 - .../fish/functions/_tide_item_nix_shell.fish | 3 - .../fish/functions/_tide_item_node.fish | 4 - .../.config/fish/functions/_tide_item_os.fish | 3 - .../fish/functions/_tide_item_php.fish | 4 - .../functions/_tide_item_private_mode.fish | 3 - .../fish/functions/_tide_item_pulumi.fish | 19 -- .../fish/functions/_tide_item_rustc.fish | 4 - .../fish/functions/_tide_item_shlvl.fish | 4 - .../fish/functions/_tide_item_status.fish | 15 -- .../fish/functions/_tide_item_terraform.fish | 6 - .../fish/functions/_tide_item_time.fish | 3 - .../fish/functions/_tide_item_toolbox.fish | 4 - .../fish/functions/_tide_item_vi_mode.fish | 16 -- .../functions/_tide_item_virtual_env.fish | 11 - .../fish/functions/_tide_parent_dirs.fish | 7 - .../fish/functions/_tide_print_item.fish | 22 -- common/.config/fish/functions/_tide_pwd.fish | 38 ---- .../_tide_remove_unusable_items.fish | 25 --- .../fish/functions/_tide_sub_bug-report.fish | 73 ------- .../fish/functions/_tide_sub_configure.fish | 95 --------- .../fish/functions/fish_mode_prompt.fish | 3 +- .../.config/fish/functions/fish_prompt.fish | 201 +++++++++++------- .../.config/fish/functions/prompt_login.fish | 40 ++++ common/.config/fish/functions/tide.fish | 27 --- .../tide/configure/choices/all/finish.fish | 33 --- .../tide/configure/choices/all/icons.fish | 33 --- .../configure/choices/all/prompt_colors.fish | 26 --- .../choices/all/prompt_connection.fish | 28 --- .../prompt_connection_andor_frame_color.fish | 36 ---- .../configure/choices/all/prompt_spacing.fish | 21 -- .../tide/configure/choices/all/show_time.fish | 31 --- .../tide/configure/choices/all/style.fish | 57 ----- .../choices/classic/classic_prompt_color.fish | 38 ---- .../classic/classic_prompt_separators.fish | 40 ---- .../choices/lean/lean_prompt_height.fish | 26 --- .../powerline/powerline_prompt_frame.fish | 46 ---- .../powerline/powerline_prompt_heads.fish | 40 ---- .../powerline/powerline_prompt_height.fish | 30 --- .../powerline/powerline_prompt_tails.fish | 48 ----- .../rainbow/rainbow_prompt_separators.fish | 40 ---- .../tide/configure/configs/classic.fish | 151 ------------- .../configure/configs/classic_16color.fish | 87 -------- .../tide/configure/configs/lean.fish | 151 ------------- .../tide/configure/configs/lean_16color.fish | 87 -------- .../tide/configure/configs/rainbow.fish | 151 ------------- .../configure/configs/rainbow_16color.fish | 91 -------- .../functions/_fake_tide_cache_variables.fish | 41 ---- .../functions/_fake_tide_item_character.fish | 5 - .../_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 - .../.config/fish/functions/update-homes.fish | 182 ++++++++++++---- .../konsole/nightfox_konsole.colorscheme | 2 +- update-home.fish | 69 ------ update-homes-secrets-example.fish | 51 +++++ update-private-example.fish | 44 ---- update.fish | 12 ++ 87 files changed, 380 insertions(+), 2565 deletions(-) delete mode 100644 common/.config/fish/completions/tide.fish delete mode 100644 common/.config/fish/conf.d/_tide_init.fish delete mode 100644 common/.config/fish/functions/_tide_1_line_prompt.fish delete mode 100644 common/.config/fish/functions/_tide_2_line_prompt.fish delete mode 100644 common/.config/fish/functions/_tide_cache_variables.fish delete mode 100644 common/.config/fish/functions/_tide_detect_os.fish delete mode 100644 common/.config/fish/functions/_tide_find_and_remove.fish delete mode 100644 common/.config/fish/functions/_tide_item_aws.fish delete mode 100644 common/.config/fish/functions/_tide_item_character.fish delete mode 100644 common/.config/fish/functions/_tide_item_chruby.fish delete mode 100644 common/.config/fish/functions/_tide_item_cmd_duration.fish delete mode 100644 common/.config/fish/functions/_tide_item_context.fish delete mode 100644 common/.config/fish/functions/_tide_item_crystal.fish delete mode 100644 common/.config/fish/functions/_tide_item_direnv.fish delete mode 100644 common/.config/fish/functions/_tide_item_distrobox.fish delete mode 100644 common/.config/fish/functions/_tide_item_docker.fish delete mode 100644 common/.config/fish/functions/_tide_item_elixir.fish delete mode 100644 common/.config/fish/functions/_tide_item_gcloud.fish delete mode 100644 common/.config/fish/functions/_tide_item_git.fish delete mode 100644 common/.config/fish/functions/_tide_item_go.fish delete mode 100644 common/.config/fish/functions/_tide_item_java.fish delete mode 100644 common/.config/fish/functions/_tide_item_jobs.fish delete mode 100644 common/.config/fish/functions/_tide_item_kubectl.fish delete mode 100644 common/.config/fish/functions/_tide_item_nix_shell.fish delete mode 100644 common/.config/fish/functions/_tide_item_node.fish delete mode 100644 common/.config/fish/functions/_tide_item_os.fish delete mode 100644 common/.config/fish/functions/_tide_item_php.fish delete mode 100644 common/.config/fish/functions/_tide_item_private_mode.fish delete mode 100644 common/.config/fish/functions/_tide_item_pulumi.fish delete mode 100644 common/.config/fish/functions/_tide_item_rustc.fish delete mode 100644 common/.config/fish/functions/_tide_item_shlvl.fish delete mode 100644 common/.config/fish/functions/_tide_item_status.fish delete mode 100644 common/.config/fish/functions/_tide_item_terraform.fish delete mode 100644 common/.config/fish/functions/_tide_item_time.fish delete mode 100644 common/.config/fish/functions/_tide_item_toolbox.fish delete mode 100644 common/.config/fish/functions/_tide_item_vi_mode.fish delete mode 100644 common/.config/fish/functions/_tide_item_virtual_env.fish delete mode 100644 common/.config/fish/functions/_tide_parent_dirs.fish delete mode 100644 common/.config/fish/functions/_tide_print_item.fish delete mode 100644 common/.config/fish/functions/_tide_pwd.fish delete mode 100644 common/.config/fish/functions/_tide_remove_unusable_items.fish delete mode 100644 common/.config/fish/functions/_tide_sub_bug-report.fish delete mode 100644 common/.config/fish/functions/_tide_sub_configure.fish mode change 100644 => 100755 common/.config/fish/functions/fish_mode_prompt.fish mode change 100644 => 100755 common/.config/fish/functions/fish_prompt.fish create mode 100755 common/.config/fish/functions/prompt_login.fish delete mode 100644 common/.config/fish/functions/tide.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/finish.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/icons.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/prompt_colors.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/prompt_connection.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/prompt_spacing.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/show_time.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/all/style.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish delete mode 100644 common/.config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish delete mode 100644 common/.config/fish/functions/tide/configure/configs/classic.fish delete mode 100644 common/.config/fish/functions/tide/configure/configs/classic_16color.fish delete mode 100644 common/.config/fish/functions/tide/configure/configs/lean.fish delete mode 100644 common/.config/fish/functions/tide/configure/configs/lean_16color.fish delete mode 100644 common/.config/fish/functions/tide/configure/configs/rainbow.fish delete mode 100644 common/.config/fish/functions/tide/configure/configs/rainbow_16color.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish delete mode 100644 common/.config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish mode change 100644 => 100755 common/.config/fish/functions/update-homes.fish delete mode 100755 update-home.fish create mode 100755 update-homes-secrets-example.fish delete mode 100755 update-private-example.fish create mode 100755 update.fish diff --git a/common/.config/fish/completions/tide.fish b/common/.config/fish/completions/tide.fish deleted file mode 100644 index 2d3784d..0000000 --- a/common/.config/fish/completions/tide.fish +++ /dev/null @@ -1,12 +0,0 @@ -complete tide --no-files - -set -l subcommands bug-report configure - -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 "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/common/.config/fish/conf.d/_tide_init.fish b/common/.config/fish/conf.d/_tide_init.fish deleted file mode 100644 index 939f17c..0000000 --- a/common/.config/fish/conf.d/_tide_init.fish +++ /dev/null @@ -1,41 +0,0 @@ -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:" - echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi - 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 ' (echo -ns "tide configure" | fish_indent --ansi) ' 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:" - echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi - sleep 3 - end -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/common/.config/fish/config.fish b/common/.config/fish/config.fish index 745ceda..2556929 100644 --- a/common/.config/fish/config.fish +++ b/common/.config/fish/config.fish @@ -2,7 +2,7 @@ # set -x COLORFGBG "default;default" set -x VISUAL "nvim" -set -x EDITOR "nvim" +set -x EDITOR "lvim" set -x PAGER "nvimpager" set -x BROWSER "firefox" set -x PATH ~/.local/bin ~/.cargo/bin ~/go/bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /usr/bin /bin /usr/games diff --git a/common/.config/fish/fish_variables b/common/.config/fish/fish_variables index 32a1030..5f11fdd 100644 --- a/common/.config/fish/fish_variables +++ b/common/.config/fish/fish_variables @@ -2,9 +2,6 @@ # VERSION: 3.0 SETUVAR VIRTUAL_ENV_DISABLE_PROMPT:true SETUVAR __fish_initialized:3400 -SETUVAR _tide_left_items:pwd\x1egit\x1enewline\x1echaracter -SETUVAR _tide_prompt_91028:\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b34m\x1b\x5b44m\x20\x40PWD\x40\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b34m\ue0b0\x1e\x1b\x5b92m\u276f\x1e\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b33m\ue0b2\x1b\x5b30m\x1b\x5b43m\x2012s\x20\x1b\x5b32m\x1b\x5b43m\x1b\x5b30m\x1b\x5b42m\x20\u2b22\x2018\x2e13\x2e0\x20\x1b\x28B\x1b\x5bm\x1b\x28B\x1b\x5bm\x1b\x5b32m -SETUVAR _tide_right_items:status\x1ecmd_duration\x1econtext\x1ejobs\x1enode\x1evirtual_env\x1erustc\x1ejava\x1ephp\x1ego SETUVAR fish_color_autosuggestion:738091 SETUVAR fish_color_cancel:9d79d6 SETUVAR fish_color_command:63cdcf @@ -53,154 +50,3 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d2b3b51 SETUVAR fish_pager_color_selected_completion: SETUVAR fish_pager_color_selected_description: SETUVAR fish_pager_color_selected_prefix: -SETUVAR tide_aws_bg_color:yellow -SETUVAR tide_aws_color:brblack -SETUVAR tide_aws_icon:\uf270 -SETUVAR tide_character_color:brgreen -SETUVAR tide_character_color_failure:brred -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_chruby_bg_color:red -SETUVAR tide_chruby_color:black -SETUVAR tide_chruby_icon:\ue23e -SETUVAR tide_cmd_duration_bg_color:yellow -SETUVAR tide_cmd_duration_color:black -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:brblack -SETUVAR tide_context_color_default:yellow -SETUVAR tide_context_color_root:yellow -SETUVAR tide_context_color_ssh:yellow -SETUVAR tide_context_hostname_parts:1 -SETUVAR tide_crystal_bg_color:brwhite -SETUVAR tide_crystal_color:black -SETUVAR tide_crystal_icon:\u2b22 -SETUVAR tide_direnv_bg_color:bryellow -SETUVAR tide_direnv_bg_color_denied:brred -SETUVAR tide_direnv_color:black -SETUVAR tide_direnv_color_denied:black -SETUVAR tide_direnv_icon:\u25bc -SETUVAR tide_distrobox_bg_color:brmagenta -SETUVAR tide_distrobox_color:black -SETUVAR tide_distrobox_icon:\u2b22 -SETUVAR tide_docker_bg_color:blue -SETUVAR tide_docker_color:black -SETUVAR tide_docker_default_contexts:default\x1ecolima -SETUVAR tide_docker_icon:\uf308 -SETUVAR tide_elixir_bg_color:magenta -SETUVAR tide_elixir_color:black -SETUVAR tide_elixir_icon:\ue62d -SETUVAR tide_gcloud_bg_color:blue -SETUVAR tide_gcloud_color:black -SETUVAR tide_gcloud_icon:\uf7ac -SETUVAR tide_git_bg_color:green -SETUVAR tide_git_bg_color_unstable:yellow -SETUVAR tide_git_bg_color_urgent:red -SETUVAR tide_git_color_branch:black -SETUVAR tide_git_color_conflicted:black -SETUVAR tide_git_color_dirty:black -SETUVAR tide_git_color_operation:black -SETUVAR tide_git_color_staged:black -SETUVAR tide_git_color_stash:black -SETUVAR tide_git_color_untracked:black -SETUVAR tide_git_color_upstream:black -SETUVAR tide_git_icon:\x1d -SETUVAR tide_git_truncation_length:24 -SETUVAR tide_git_truncation_strategy:\x1d -SETUVAR tide_go_bg_color:brcyan -SETUVAR tide_go_color:black -SETUVAR tide_go_icon:\ue627 -SETUVAR tide_java_bg_color:yellow -SETUVAR tide_java_color:black -SETUVAR tide_java_icon:\ue256 -SETUVAR tide_jobs_bg_color:brblack -SETUVAR tide_jobs_color:green -SETUVAR tide_jobs_icon:\uf013 -SETUVAR tide_kubectl_bg_color:blue -SETUVAR tide_kubectl_color:black -SETUVAR tide_kubectl_icon:\u2388 -SETUVAR tide_left_prompt_frame_enabled:false -SETUVAR tide_left_prompt_items:pwd\x1egit\x1enewline\x1echaracter -SETUVAR tide_left_prompt_prefix: -SETUVAR tide_left_prompt_separator_diff_color: -SETUVAR tide_left_prompt_separator_same_color:\ue0b1 -SETUVAR tide_left_prompt_suffix:\ue0b0 -SETUVAR tide_nix_shell_bg_color:brblue -SETUVAR tide_nix_shell_color:black -SETUVAR tide_nix_shell_icon:\uf313 -SETUVAR tide_node_bg_color:green -SETUVAR tide_node_color:black -SETUVAR tide_node_icon:\u2b22 -SETUVAR tide_os_bg_color:white -SETUVAR tide_os_color:black -SETUVAR tide_os_icon:\uf306 -SETUVAR tide_php_bg_color:blue -SETUVAR tide_php_color:black -SETUVAR tide_php_icon:\ue608 -SETUVAR tide_private_mode_bg_color:brwhite -SETUVAR tide_private_mode_color:black -SETUVAR tide_private_mode_icon:\ufaf8 -SETUVAR tide_prompt_add_newline_before:true -SETUVAR tide_prompt_color_frame_and_connection:brblack -SETUVAR tide_prompt_color_separator_same_color:brblack -SETUVAR tide_prompt_icon_connection:\u2500 -SETUVAR tide_prompt_min_cols:34 -SETUVAR tide_prompt_pad_items:true -SETUVAR tide_pulumi_bg_color:yellow -SETUVAR tide_pulumi_color:black -SETUVAR tide_pulumi_icon:\uf1b2 -SETUVAR tide_pwd_bg_color:blue -SETUVAR tide_pwd_color_anchors:brwhite -SETUVAR tide_pwd_color_dirs:brwhite -SETUVAR tide_pwd_color_truncated_dirs:white -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 -SETUVAR tide_right_prompt_frame_enabled:true -SETUVAR tide_right_prompt_items:status\x1ecmd_duration\x1econtext\x1ejobs\x1edirenv\x1enode\x1evirtual_env\x1erustc\x1ejava\x1ephp\x1epulumi\x1echruby\x1ego\x1egcloud\x1ekubectl\x1edistrobox\x1etoolbox\x1eterraform\x1eaws\x1enix_shell\x1ecrystal\x1eelixir -SETUVAR tide_right_prompt_prefix:\ue0b2 -SETUVAR tide_right_prompt_separator_diff_color: -SETUVAR tide_right_prompt_separator_same_color:\ue0b3 -SETUVAR tide_right_prompt_suffix: -SETUVAR tide_rustc_bg_color:red -SETUVAR tide_rustc_color:black -SETUVAR tide_rustc_icon:\ue7a8 -SETUVAR tide_shlvl_bg_color:yellow -SETUVAR tide_shlvl_color:black -SETUVAR tide_shlvl_icon:\uf120 -SETUVAR tide_shlvl_threshold:1 -SETUVAR tide_status_bg_color:black -SETUVAR tide_status_bg_color_failure:red -SETUVAR tide_status_color:green -SETUVAR tide_status_color_failure:bryellow -SETUVAR tide_status_icon:\u2714 -SETUVAR tide_status_icon_failure:\u2718 -SETUVAR tide_terraform_bg_color:magenta -SETUVAR tide_terraform_color:black -SETUVAR tide_terraform_icon:\x1d -SETUVAR tide_time_bg_color:white -SETUVAR tide_time_color:black -SETUVAR tide_time_format: -SETUVAR tide_toolbox_bg_color:magenta -SETUVAR tide_toolbox_color:black -SETUVAR tide_toolbox_icon:\u2b22 -SETUVAR tide_vi_mode_bg_color_default:white -SETUVAR tide_vi_mode_bg_color_insert:cyan -SETUVAR tide_vi_mode_bg_color_replace:green -SETUVAR tide_vi_mode_bg_color_visual:yellow -SETUVAR tide_vi_mode_color_default:black -SETUVAR tide_vi_mode_color_insert:black -SETUVAR tide_vi_mode_color_replace:black -SETUVAR tide_vi_mode_color_visual:black -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_virtual_env_bg_color:brblack -SETUVAR tide_virtual_env_color:cyan -SETUVAR tide_virtual_env_icon:\ue73c diff --git a/common/.config/fish/functions/_tide_1_line_prompt.fish b/common/.config/fish/functions/_tide_1_line_prompt.fish deleted file mode 100644 index 5772223..0000000 --- a/common/.config/fish/functions/_tide_1_line_prompt.fish +++ /dev/null @@ -1,19 +0,0 @@ -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/common/.config/fish/functions/_tide_2_line_prompt.fish b/common/.config/fish/functions/_tide_2_line_prompt.fish deleted file mode 100644 index e9017af..0000000 --- a/common/.config/fish/functions/_tide_2_line_prompt.fish +++ /dev/null @@ -1,31 +0,0 @@ -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/common/.config/fish/functions/_tide_cache_variables.fish b/common/.config/fish/functions/_tide_cache_variables.fish deleted file mode 100644 index 31e3850..0000000 --- a/common/.config/fish/functions/_tide_cache_variables.fish +++ /dev/null @@ -1,17 +0,0 @@ -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/common/.config/fish/functions/_tide_detect_os.fish b/common/.config/fish/functions/_tide_detect_os.fish deleted file mode 100644 index 5a3263f..0000000 --- a/common/.config/fish/functions/_tide_detect_os.fish +++ /dev/null @@ -1,75 +0,0 @@ -# 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 '*' - return 1 - end -end diff --git a/common/.config/fish/functions/_tide_find_and_remove.fish b/common/.config/fish/functions/_tide_find_and_remove.fish deleted file mode 100644 index 29f2180..0000000 --- a/common/.config/fish/functions/_tide_find_and_remove.fish +++ /dev/null @@ -1,3 +0,0 @@ -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/common/.config/fish/functions/_tide_item_aws.fish b/common/.config/fish/functions/_tide_item_aws.fish deleted file mode 100644 index 7cb6338..0000000 --- a/common/.config/fish/functions/_tide_item_aws.fish +++ /dev/null @@ -1,11 +0,0 @@ -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/common/.config/fish/functions/_tide_item_character.fish b/common/.config/fish/functions/_tide_item_character.fish deleted file mode 100644 index 10bb324..0000000 --- a/common/.config/fish/functions/_tide_item_character.fish +++ /dev/null @@ -1,17 +0,0 @@ -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/common/.config/fish/functions/_tide_item_chruby.fish b/common/.config/fish/functions/_tide_item_chruby.fish deleted file mode 100644 index 02d5fbd..0000000 --- a/common/.config/fish/functions/_tide_item_chruby.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_chruby - test -n "$RUBY_VERSION" && _tide_print_item chruby $tide_chruby_icon' ' $RUBY_VERSION -end diff --git a/common/.config/fish/functions/_tide_item_cmd_duration.fish b/common/.config/fish/functions/_tide_item_cmd_duration.fish deleted file mode 100644 index bc48bac..0000000 --- a/common/.config/fish/functions/_tide_item_cmd_duration.fish +++ /dev/null @@ -1,12 +0,0 @@ -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/common/.config/fish/functions/_tide_item_context.fish b/common/.config/fish/functions/_tide_item_context.fish deleted file mode 100644 index 575c438..0000000 --- a/common/.config/fish/functions/_tide_item_context.fish +++ /dev/null @@ -1,15 +0,0 @@ -function _tide_item_context - if set -q SSH_TTY - set -lx tide_context_color $tide_context_color_ssh - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) - else if test "$EUID" = 0 - set -lx tide_context_color $tide_context_color_root - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) - else if test "$tide_context_always_display" = true - set -lx tide_context_color $tide_context_color_default - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) - end -end diff --git a/common/.config/fish/functions/_tide_item_crystal.fish b/common/.config/fish/functions/_tide_item_crystal.fish deleted file mode 100644 index cec9752..0000000 --- a/common/.config/fish/functions/_tide_item_crystal.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_crystal - path is $_tide_parent_dirs/shard.yml && - _tide_print_item crystal $tide_crystal_icon' ' (crystal --version | string match -r "[\d.]+")[1] -end diff --git a/common/.config/fish/functions/_tide_item_direnv.fish b/common/.config/fish/functions/_tide_item_direnv.fish deleted file mode 100644 index 5084674..0000000 --- a/common/.config/fish/functions/_tide_item_direnv.fish +++ /dev/null @@ -1,7 +0,0 @@ -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/common/.config/fish/functions/_tide_item_distrobox.fish b/common/.config/fish/functions/_tide_item_distrobox.fish deleted file mode 100644 index 5e06a8b..0000000 --- a/common/.config/fish/functions/_tide_item_distrobox.fish +++ /dev/null @@ -1,4 +0,0 @@ -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/common/.config/fish/functions/_tide_item_git.fish b/common/.config/fish/functions/_tide_item_git.fish deleted file mode 100644 index c419695..0000000 --- a/common/.config/fish/functions/_tide_item_git.fish +++ /dev/null @@ -1,67 +0,0 @@ -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 - read -f step <$gdir/rebase-merge/msgnum - read -f total_steps <$gdir/rebase-merge/end - test -f $gdir/rebase-merge/interactive && set -f operation rebase-i || set -f operation rebase-m - else if test -d $gdir/rebase-apply - read -f step <$gdir/rebase-apply/next - read -f total_steps <$gdir/rebase-apply/last - 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/common/.config/fish/functions/_tide_item_go.fish b/common/.config/fish/functions/_tide_item_go.fish deleted file mode 100644 index 7c5919f..0000000 --- a/common/.config/fish/functions/_tide_item_go.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_go - path is $_tide_parent_dirs/go.mod && - _tide_print_item go $tide_go_icon' ' (go version | string match -r "[\d.]+") -end diff --git a/common/.config/fish/functions/_tide_item_java.fish b/common/.config/fish/functions/_tide_item_java.fish deleted file mode 100644 index 6105acc..0000000 --- a/common/.config/fish/functions/_tide_item_java.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_java - path is $_tide_parent_dirs/pom.xml && - _tide_print_item java $tide_java_icon' ' (java -version &| string match -r "[\d.]+")[1] -end diff --git a/common/.config/fish/functions/_tide_item_jobs.fish b/common/.config/fish/functions/_tide_item_jobs.fish deleted file mode 100644 index 96cf902..0000000 --- a/common/.config/fish/functions/_tide_item_jobs.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_jobs - set -q _tide_jobs && _tide_print_item jobs $tide_jobs_icon -end diff --git a/common/.config/fish/functions/_tide_item_kubectl.fish b/common/.config/fish/functions/_tide_item_kubectl.fish deleted file mode 100644 index ab044b3..0000000 --- a/common/.config/fish/functions/_tide_item_kubectl.fish +++ /dev/null @@ -1,4 +0,0 @@ -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/common/.config/fish/functions/_tide_item_nix_shell.fish b/common/.config/fish/functions/_tide_item_nix_shell.fish deleted file mode 100644 index 647f606..0000000 --- a/common/.config/fish/functions/_tide_item_nix_shell.fish +++ /dev/null @@ -1,3 +0,0 @@ -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/common/.config/fish/functions/_tide_item_node.fish b/common/.config/fish/functions/_tide_item_node.fish deleted file mode 100644 index 0588051..0000000 --- a/common/.config/fish/functions/_tide_item_node.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_node - path is $_tide_parent_dirs/package.json && - _tide_print_item node $tide_node_icon' ' (node --version | string trim --chars=v) -end diff --git a/common/.config/fish/functions/_tide_item_os.fish b/common/.config/fish/functions/_tide_item_os.fish deleted file mode 100644 index 8a6208c..0000000 --- a/common/.config/fish/functions/_tide_item_os.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_os - _tide_print_item os $tide_os_icon -end diff --git a/common/.config/fish/functions/_tide_item_php.fish b/common/.config/fish/functions/_tide_item_php.fish deleted file mode 100644 index abc104e..0000000 --- a/common/.config/fish/functions/_tide_item_php.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_php - path is $_tide_parent_dirs/composer.json && - _tide_print_item php $tide_php_icon' ' (php --version | string match -r 'PHP ([\d.]+)')[2] -end diff --git a/common/.config/fish/functions/_tide_item_private_mode.fish b/common/.config/fish/functions/_tide_item_private_mode.fish deleted file mode 100644 index 4eb4684..0000000 --- a/common/.config/fish/functions/_tide_item_private_mode.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_private_mode - set -q _tide_private_mode && _tide_print_item private_mode $tide_private_mode_icon -end diff --git a/common/.config/fish/functions/_tide_item_pulumi.fish b/common/.config/fish/functions/_tide_item_pulumi.fish deleted file mode 100644 index 9f5e2db..0000000 --- a/common/.config/fish/functions/_tide_item_pulumi.fish +++ /dev/null @@ -1,19 +0,0 @@ -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 sub -e40 | read -f path_hash - else if command -q shasum - echo -n "$yaml_path" | shasum | string sub -e40 | read -f path_hash - end - - if test -n "$path_hash" - string match -rg 'name: *(.*)' <$yaml_path | read -l project_name - set -l workspace_file "$HOME/.pulumi/workspaces/$project_name-$path_hash-workspace.json" - - if test -e $workspace_file - string match -rg '"stack": *"(.*)"' <$workspace_file | read -l stack - _tide_print_item pulumi $tide_pulumi_icon' ' $stack - end - end - end -end diff --git a/common/.config/fish/functions/_tide_item_rustc.fish b/common/.config/fish/functions/_tide_item_rustc.fish deleted file mode 100644 index 2e71645..0000000 --- a/common/.config/fish/functions/_tide_item_rustc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_rustc - path is $_tide_parent_dirs/Cargo.toml && - _tide_print_item rustc $tide_rustc_icon' ' (rustc --version | string split ' ')[2] -end diff --git a/common/.config/fish/functions/_tide_item_shlvl.fish b/common/.config/fish/functions/_tide_item_shlvl.fish deleted file mode 100644 index 95dd5ff..0000000 --- a/common/.config/fish/functions/_tide_item_shlvl.fish +++ /dev/null @@ -1,4 +0,0 @@ -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/common/.config/fish/functions/_tide_item_status.fish b/common/.config/fish/functions/_tide_item_status.fish deleted file mode 100644 index 3a040fd..0000000 --- a/common/.config/fish/functions/_tide_item_status.fish +++ /dev/null @@ -1,15 +0,0 @@ -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/common/.config/fish/functions/_tide_item_terraform.fish b/common/.config/fish/functions/_tide_item_terraform.fish deleted file mode 100644 index 8d99fb7..0000000 --- a/common/.config/fish/functions/_tide_item_terraform.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_terraform - if path is $_tide_parent_dirs/.terraform - terraform workspace show | read -l workspace - test $workspace != default && _tide_print_item terraform $tide_terraform_icon' ' $workspace - end -end diff --git a/common/.config/fish/functions/_tide_item_time.fish b/common/.config/fish/functions/_tide_item_time.fish deleted file mode 100644 index b8522bc..0000000 --- a/common/.config/fish/functions/_tide_item_time.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_time - _tide_print_item time (date +$tide_time_format) -end diff --git a/common/.config/fish/functions/_tide_item_toolbox.fish b/common/.config/fish/functions/_tide_item_toolbox.fish deleted file mode 100644 index 0b33f29..0000000 --- a/common/.config/fish/functions/_tide_item_toolbox.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_toolbox - test -e /run/.toolboxenv && - _tide_print_item toolbox $tide_toolbox_icon' ' (string match -rg 'name="(.*)"' \..|.)\" \$dir_section - while v=\$parent_dir/\$trunc*/ set -q v[2] && string match -qr \"(?\$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/common/.config/fish/functions/_tide_remove_unusable_items.fish b/common/.config/fish/functions/_tide_remove_unusable_items.fish deleted file mode 100644 index a2e5698..0000000 --- a/common/.config/fish/functions/_tide_remove_unusable_items.fish +++ /dev/null @@ -1,25 +0,0 @@ -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 chruby crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi rustc terraform toolbox virtual_env - 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 virtual_env - set cli_names python python3 - case nix_shell - set cli_names nix nix-shell - 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/common/.config/fish/functions/_tide_sub_bug-report.fish b/common/.config/fish/functions/_tide_sub_bug-report.fish deleted file mode 100644 index 5f087c8..0000000 --- a/common/.config/fish/functions/_tide_sub_bug-report.fish +++ /dev/null @@ -1,73 +0,0 @@ -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@v5" - 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/common/.config/fish/functions/_tide_sub_configure.fish b/common/.config/fish/functions/_tide_sub_configure.fish deleted file mode 100644 index cb87290..0000000 --- a/common/.config/fish/functions/_tide_sub_configure.fish +++ /dev/null @@ -1,95 +0,0 @@ -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 - 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 - command -q clear && clear - set_color -o - string pad --width (math --scale=0 "$fake_columns/2" + (string length $text)/2) $text - set_color normal -end - -function _tide_option -a symbol text - set -ga _tide_option_list $symbol - - set_color -o - echo "($symbol) $text" - set_color normal -end - -function _tide_menu - set -l list_with_slashes (string join '/' $_tide_option_list) - - echo '(r) Restart from the beginning' - echo '(q) Quit and do nothing'\n - - while true - set_color -o - read --nchars 1 --prompt-str "Choice [$list_with_slashes/r/q] " input - set_color normal - - switch $input - case r - set -e _tide_option_list - _next_choice all/style - break - case q - set -e _tide_selected_option # Skip through all the _next_choices - set -e _tide_option_list - command -q clear && clear - break - case $_tide_option_list - set -e _tide_option_list - set -g _tide_selected_option $input - break - end - end -end - -function _tide_display_prompt -a var_name var_value - test -n "$var_name" && set -g $var_name $var_value - _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" - - string unescape $prompt[2..] - set_color normal - echo -end diff --git a/common/.config/fish/functions/fish_mode_prompt.fish b/common/.config/fish/functions/fish_mode_prompt.fish old mode 100644 new mode 100755 index f37cf7d..805d97e --- a/common/.config/fish/functions/fish_mode_prompt.fish +++ b/common/.config/fish/functions/fish_mode_prompt.fish @@ -1 +1,2 @@ -# Disable default vi prompt +function fish_mode_prompt --description "Display vi prompt mode" +end diff --git a/common/.config/fish/functions/fish_prompt.fish b/common/.config/fish/functions/fish_prompt.fish old mode 100644 new mode 100755 index 3e820c4..e11162d --- a/common/.config/fish/functions/fish_prompt.fish +++ b/common/.config/fish/functions/fish_prompt.fish @@ -1,90 +1,143 @@ -function fish_prompt -end # In case this file gets loaded non-interactively, e.g by conda -status is-interactive || exit +# name: Nerv +# author: kujiu +# description: based on Astronaut of Radu Potop and on Disco of Fabian Homborg, colors from Nightfox by EdenEast -_tide_remove_unusable_items -_tide_cache_variables -_tide_parent_dirs -source (functions --details _tide_pwd) +function fish_prompt --description 'Write out the prompt' + set -f color_venv 71839b + set -f color_bind normal + set -f color_text 131a24 + set -f color_magenta 9d79d6 + set -f color_blue 719cd6 + set -f color_cyan 63cdcf + set -f color_green 81b29a + set -f color_yellow dbc074 + set -f color_orange f4a261 + set -f color_red c94f6d + set -f color_pink d67ad2 + set -f color_white dfdfe0 + set -f color_bg0 131a24 + set -f color_bg1 192330 + set -f color_bg2 212e3f + set -f color_bg3 29394f + set -f color_status $color_yellow + set -f color_bind $color_green + set -f color_cwd $fish_color_cwd + set -f color_vcs_text $color_yellow + set -f color_vcs_bg $color_bg3 + set -f char_bind 'E' + set -f char_user_cwd '%' + set -f char_root_cwd '#' -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 -l last_status $status + set -l normal (set_color normal) + set -l prompt_status "" -set_color normal | read -l color_normal -status fish-path | read -l fish_path + set -g __fish_git_prompt_color $color_blue + set -g __fish_git_prompt_showstashstate 1 + set -g __fish_git_prompt_showdirtystate 1 + set -g __fish_git_prompt_showuntrackedfiles 1 + set -g __fish_git_prompt_showupstream informative + set -g __fish_git_prompt_showcolorhints 1 + set -g __fish_git_prompt_use_informative_chars 0 + set -g __fish_git_prompt_show_informative_status 1 + set -g __fish_git_prompt_char_stateseparator '|' + set -g __fish_git_prompt_char_cleanstate 'C' + set -g __fish_git_prompt_char_dirtystate "+" + set -g __fish_git_prompt_char_invalidstate "#" + set -g __fish_git_prompt_char_stagedstate "S" + set -g __fish_git_prompt_char_stashstate "\$" + set -g __fish_git_prompt_char_upstream_ahead "↑" + set -g __fish_git_prompt_char_upstream_behind "↓" + set -g __fish_git_prompt_char_upstream_diverged "!=" + set -g __fish_git_prompt_char_upstream_equal "==" -# _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 + set -g __fish_git_prompt_color_branch -b $color_vcs_bg $color_vcs_text + set -g __fish_git_prompt_color_branch_detached -b $color_vcs_bg $color_red + set -g __fish_git_prompt_color_branch_dirty -b $color_vcs_bg $color_blue + set -g __fish_git_prompt_color_branch_staged -b $color_vcs_bg $color_green + set -g __fish_git_prompt_color_flags -b $color_vcs_bg $color_vcs_text -if contains newline $_tide_left_items # two line prompt initialization - test "$tide_prompt_add_newline_before" = true && set -l add_newline '\n' + set -g __fish_git_prompt_color -b $color_vcs_bg $color_vcs_text + set -g __fish_git_prompt_color_prefix -b $color_vcs_bg $color_vcs_text + set -g __fish_git_prompt_color_suffix -b $color_vcs_bg $color_vcs_text + set -g __fish_git_prompt_color_bare -b $color_vcs_bg $color_magenta --bold + set -g __fish_git_prompt_color_merging -b $color_vcs_bg $color_red --bold + set -g __fish_git_prompt_color_cleanstate -b $color_vcs_bg $color_vcs_text --bold + set -g __fish_git_prompt_color_dirtystate -b $color_vcs_bg $color_blue --bold + set -g __fish_git_prompt_color_invalidstate -b $color_vcs_bg $color_red --bold + set -g __fish_git_prompt_color_stagedstate -b $color_vcs_bg $color_green --bold + set -g __fish_git_prompt_color_stashstate -b $color_vcs_bg $color_orange --bold + set -g __fish_git_prompt_color_untrackedfiles -b $color_vcs_bg $color_blue --bold + set -g __fish_git_prompt_color_upstream -b $color_vcs_bg $color_vcs_text --bold - set_color $tide_prompt_color_frame_and_connection -b normal | read -l prompt_and_frame_color + set -g __fish_git_prompt_color_prefix_done $normal + set -g __fish_git_prompt_color_bare_done $normal + set -g __fish_git_prompt_color_merging_done $normal + set -g __fish_git_prompt_color_cleanstate_done $normal + set -g __fish_git_prompt_color_dirtystate_done $normal + set -g __fish_git_prompt_color_invalidstate_done $normal + set -g __fish_git_prompt_color_stagedstate_done $normal + set -g __fish_git_prompt_color_stashstate_done $normal + set -g __fish_git_prompt_color_untrackedfiles_done $normal + set -g __fish_git_prompt_color_upstream_done $normal - 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) + # We don't want the leading space. + set -l vcs (fish_vcs_prompt '%s' 2>/dev/null) - eval " -function fish_prompt - _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -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 + # Since we display the prompt on a new line allow the directory names to be longer. + set -q fish_prompt_pwd_dir_length + or set -lx fish_prompt_pwd_dir_length 0 - command kill \$_tide_last_pid 2>/dev/null - set -g _tide_last_pid \$last_pid + # Color the prompt differently when we're root + set -l suffix $char_user_cwd + if functions -q fish_is_root_user; and fish_is_root_user + if set -q fish_color_cwd_root + set color_cwd $fish_color_cwd_root + end + set suffix $char_root_cwd 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" -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" - - eval " -function fish_prompt - _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -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 + # Color the prompt in red on error + if test $last_status -ne 0 + set color_status $color_red + set prompt_status "[" $last_status "]" 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 ' + echo -s (prompt_login) (set_color -b $color_cwd $color_text) (prompt_pwd) (set_color -b $color_vcs_bg $color_cwd) '' (set_color -b $color_vcs_bg $color_vcs_text) (fish_vcs_prompt) (set_color -b normal $color_vcs_bg) '' $normal + + set -l venv "" + set -q VIRTUAL_ENV_DISABLE_PROMPT + or set -g VIRTUAL_ENV_DISABLE_PROMPT true + set -q VIRTUAL_ENV + and set -l venv (string replace -r '.*/' '' -- "$VIRTUAL_ENV") + + # Do nothing if not in vi mode + if test "$fish_key_bindings" = fish_vi_key_bindings + or test "$fish_key_bindings" = fish_hybrid_key_bindings + switch $fish_bind_mode + case default + set -f color_bind $color_red + set -f char_bind 'N' + case insert + set -f color_bind $color_green + set -f char_bind 'I' + case replace_one + set -f color_bind $color_blue + set -f char_bind 'r' + case replace + set -f color_bind $color_cyan + set -f char_bind 'R' + case visual + set -f color_bind $color_magenta + set -f char_bind 'V' + end + end + + echo -n -s $normal + echo -n -s (set_color --bold -b $color_bind $color_text) $char_bind (set_color -b $color_venv $color_bind) '' + echo -n -s (set_color --bold -b $color_venv $color_text) $venv (set_color -b $color_status $color_venv) '' + echo -n -s (set_color -b $color_status $color_text) $prompt_status $suffix (set_color -b normal $color_status) ' ' $normal end -function fish_right_prompt - string unescape \"\$$prompt_var[1][2]$color_normal\" -end" +function fish_right_prompt -d "Right prompt" end - -eval "function _tide_on_fish_exit --on-event fish_exit - set -e $prompt_var -end" diff --git a/common/.config/fish/functions/prompt_login.fish b/common/.config/fish/functions/prompt_login.fish new file mode 100755 index 0000000..073d798 --- /dev/null +++ b/common/.config/fish/functions/prompt_login.fish @@ -0,0 +1,40 @@ +#!/usr/bin/env fish +# +# From official prompt_login.fish of fish + +function prompt_login --description "display user name for the prompt" + set -f color_dark_text 131a24 + set -f color_cwd $fish_color_cwd + if functions -q fish_is_root_user; and fish_is_root_user + if set -q fish_color_cwd_root + set color_cwd $fish_color_cwd_root + end + end + + if not set -q __fish_machine + set -g __fish_machine + set -l debian_chroot $debian_chroot + + if test -r /etc/debian_chroot + set debian_chroot (cat /etc/debian_chroot) + end + + if set -q debian_chroot[1] + and test -n "$debian_chroot" + set -g __fish_machine "(chroot:$debian_chroot)" + end + end + + # Prepend the chroot environment if present + if set -q __fish_machine[1] + echo -n -s (set_color -b $fish_color_quote $color_dark_text) "$__fish_machine" (set_color -b $fish_color_user $fish_color_quote)  + end + + # If we're running via SSH, change the host color. + set -l color_host $fish_color_host + if set -q SSH_TTY; and set -q fish_color_host_remote + set color_host $fish_color_host_remote + end + + echo -n -s (set_color -b $fish_color_user $color_dark_text) "$USER" (set_color -b $color_host $fish_color_user)  (set_color -b $color_host $color_dark_text) (prompt_hostname) (set_color -b $color_cwd $color_host)  (set_color -b $color_cwd $color_dark_text) +end diff --git a/common/.config/fish/functions/tide.fish b/common/.config/fish/functions/tide.fish deleted file mode 100644 index 84bbbf1..0000000 --- a/common/.config/fish/functions/tide.fish +++ /dev/null @@ -1,27 +0,0 @@ -function tide --description 'Manage your Tide prompt' - argparse --stop-nonopt v/version h/help -- $argv - - if set -q _flag_version - echo 'tide, version 5.6.0' - 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' \ - ' bug-report print info for use in bug reports' -end diff --git a/common/.config/fish/functions/tide/configure/choices/all/finish.fish b/common/.config/fish/functions/tide/configure/choices/all/finish.fish deleted file mode 100644 index f60a128..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/finish.fish +++ /dev/null @@ -1,33 +0,0 @@ -function finish - set_color red - _tide_title 'Overwrite tide config?' - set_color normal - - _tide_option y Yes - echo - - _tide_menu - switch $_tide_selected_option - case y - _tide_finish - command -q clear && clear - end -end - -function _tide_finish - set -e _tide_selected_option # Skip through all the _next_choices - - # 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 - source (functions --details fish_prompt) -end diff --git a/common/.config/fish/functions/tide/configure/choices/all/icons.fish b/common/.config/fish/functions/tide/configure/choices/all/icons.fish deleted file mode 100644 index e53bffa..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/icons.fish +++ /dev/null @@ -1,33 +0,0 @@ -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 - switch $_tide_selected_option - case 1 - _disable_icons - end - _next_choice all/finish -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/common/.config/fish/functions/tide/configure/choices/all/prompt_colors.fish b/common/.config/fish/functions/tide/configure/choices/all/prompt_colors.fish deleted file mode 100644 index 90b1a9d..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/prompt_colors.fish +++ /dev/null @@ -1,26 +0,0 @@ -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 - switch $_tide_selected_option - case 1 - _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 2 - _next_choice all/show_time - end -end diff --git a/common/.config/fish/functions/tide/configure/choices/all/prompt_connection.fish b/common/.config/fish/functions/tide/configure/choices/all/prompt_connection.fish deleted file mode 100644 index ae31ef3..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/prompt_connection.fish +++ /dev/null @@ -1,28 +0,0 @@ -function prompt_connection - _tide_title 'Prompt Connection' - - _tide_option 1 Disconnected - _tide_display_prompt fake_tide_prompt_icon_connection ' ' - - _tide_option 2 Dotted - _tide_display_prompt fake_tide_prompt_icon_connection '·' - - _tide_option 3 Solid - _tide_display_prompt fake_tide_prompt_icon_connection '─' - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_prompt_icon_connection ' ' - case 2 - set -g fake_tide_prompt_icon_connection '·' - case 3 - 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_prompt_frame - end -end diff --git a/common/.config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish b/common/.config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish deleted file mode 100644 index b8803b4..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish +++ /dev/null @@ -1,36 +0,0 @@ -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 - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 808080 - - _tide_option 2 Light - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 6C6C6C - - _tide_option 3 Dark - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 585858 - - _tide_option 4 Darkest - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 444444 - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_prompt_color_frame_and_connection 808080 - case 2 - set -g fake_tide_prompt_color_frame_and_connection 6C6C6C - case 3 - set -g fake_tide_prompt_color_frame_and_connection 585858 - case 4 - set -g fake_tide_prompt_color_frame_and_connection 444444 - end - _next_choice all/prompt_spacing -end diff --git a/common/.config/fish/functions/tide/configure/choices/all/prompt_spacing.fish b/common/.config/fish/functions/tide/configure/choices/all/prompt_spacing.fish deleted file mode 100644 index a5bb98b..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/prompt_spacing.fish +++ /dev/null @@ -1,21 +0,0 @@ -function prompt_spacing - _tide_title 'Prompt Spacing' - - _tide_option 1 Compact - _tide_display_prompt - printf \e\[1A # Move cursor up 1 row - _tide_display_prompt - - _tide_option 2 Sparse - _tide_display_prompt - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_prompt_add_newline_before false - case 2 - set -g fake_tide_prompt_add_newline_before true - end - _next_choice all/icons -end diff --git a/common/.config/fish/functions/tide/configure/choices/all/show_time.fish b/common/.config/fish/functions/tide/configure/choices/all/show_time.fish deleted file mode 100644 index 8cf1843..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/show_time.fish +++ /dev/null @@ -1,31 +0,0 @@ -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' - _tide_display_prompt fake_tide_time_format %T - - _tide_option 3 '12-hour format' - _tide_display_prompt fake_tide_time_format '%r' - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_time_format '' - set -e fake_tide_right_prompt_items[-1] - case 2 - set -g fake_tide_time_format %T - case 3 - 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/common/.config/fish/functions/tide/configure/choices/all/style.fish b/common/.config/fish/functions/tide/configure/choices/all/style.fish deleted file mode 100644 index ae52bc5..0000000 --- a/common/.config/fish/functions/tide/configure/choices/all/style.fish +++ /dev/null @@ -1,57 +0,0 @@ -function style - _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_style_menu - switch $_tide_selected_option - case 1 - _load_config lean - set -g _tide_configure_style lean - case 2 - _load_config classic - set -g _tide_configure_style classic - case 3 - _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)/../../configs/$name.fish | source -end - -function _tide_style_menu # Exactly like _tide_menu except that it doesn't have (r) option - set -l list_with_slashes (string join '/' $_tide_option_list) - - echo '(q) Quit and do nothing'\n - - while true - set_color -o - read --nchars 1 --prompt-str "Choice [$list_with_slashes/q] " input - set_color normal - - switch $input - case q - set -e _tide_selected_option # Skip through all the _next_choices - set -e _tide_option_list - command -q clear && clear - break - case $_tide_option_list - set -e _tide_option_list - set -g _tide_selected_option $input - break - end - end -end diff --git a/common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish b/common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish deleted file mode 100644 index 2189f36..0000000 --- a/common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish +++ /dev/null @@ -1,38 +0,0 @@ -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 - switch $_tide_selected_option - case 1 - _set_all_items_bg_color 585858 - case 2 - _set_all_items_bg_color 444444 - case 3 - _set_all_items_bg_color 303030 - case 4 - _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/common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish b/common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish deleted file mode 100644 index 17b88e4..0000000 --- a/common/.config/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish +++ /dev/null @@ -1,40 +0,0 @@ -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 - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_separator_same_color  - set -g fake_tide_right_prompt_separator_same_color  - case 2 - set -g fake_tide_left_prompt_separator_same_color '│' - set -g fake_tide_right_prompt_separator_same_color '│' - case 3 - set -g fake_tide_left_prompt_separator_same_color '╱' - set -g fake_tide_right_prompt_separator_same_color '╱' - case 4 - 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/common/.config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish b/common/.config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish deleted file mode 100644 index 4db04a8..0000000 --- a/common/.config/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish +++ /dev/null @@ -1,26 +0,0 @@ -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 - switch $_tide_selected_option - case 1 - _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 2 - _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/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish b/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish deleted file mode 100644 index 19b3588..0000000 --- a/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish +++ /dev/null @@ -1,46 +0,0 @@ -function powerline_prompt_frame - _tide_title 'Prompt Frame' - - _tide_option 1 'No frame' - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - set -a fake_tide_left_prompt_items character - _tide_display_prompt - set -e fake_tide_left_prompt_items[-1] - - _tide_option 2 Left - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled false - _tide_display_prompt - - _tide_option 3 Right - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled true - set -a fake_tide_left_prompt_items character - _tide_display_prompt - set -e fake_tide_left_prompt_items[-1] - - _tide_option 4 Full - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - set -a fake_tide_left_prompt_items character - case 2 - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled false - case 3 - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled true - set -a fake_tide_left_prompt_items character - case 4 - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - end - _next_choice all/prompt_connection_andor_frame_color -end diff --git a/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish b/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish deleted file mode 100644 index ac187c9..0000000 --- a/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish +++ /dev/null @@ -1,40 +0,0 @@ -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 Blurred - set -g fake_tide_left_prompt_suffix '▓▒░' - set -g fake_tide_right_prompt_prefix '░▒▓' - _tide_display_prompt - - _tide_option 3 Slanted - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - _tide_display_prompt - - _tide_option 4 Round - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_suffix  - set -g fake_tide_right_prompt_prefix  - case 2 - set -g fake_tide_left_prompt_suffix '▓▒░' - set -g fake_tide_right_prompt_prefix '░▒▓' - case 3 - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - case 4 - 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/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish b/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish deleted file mode 100644 index 83fef05..0000000 --- a/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish +++ /dev/null @@ -1,30 +0,0 @@ -function powerline_prompt_height - _tide_title 'Prompt Height' - - _tide_option 1 'One line' - _tide_find_and_remove newline fake_tide_left_prompt_items - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - _tide_display_prompt - - _tide_option 2 'Two lines' - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items newline - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _tide_find_and_remove newline 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 2 - _tide_find_and_remove newline fake_tide_left_prompt_items - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items newline - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _next_choice all/prompt_connection - end -end diff --git a/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish b/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish deleted file mode 100644 index 02f4609..0000000 --- a/common/.config/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish +++ /dev/null @@ -1,48 +0,0 @@ -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 Blurred - set -g fake_tide_left_prompt_prefix '░▒▓' - set -g fake_tide_right_prompt_suffix '▓▒░' - _tide_display_prompt - - _tide_option 3 Sharp - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - _tide_display_prompt - - _tide_option 4 Slanted - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - _tide_display_prompt - - _tide_option 5 Round - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - case 2 - set -g fake_tide_left_prompt_prefix '░▒▓' - set -g fake_tide_right_prompt_suffix '▓▒░' - case 3 - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - case 4 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - case 5 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - end - _next_choice powerline/powerline_prompt_height -end diff --git a/common/.config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish b/common/.config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish deleted file mode 100644 index 29f6ccc..0000000 --- a/common/.config/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish +++ /dev/null @@ -1,40 +0,0 @@ -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 - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_separator_diff_color  - set -g fake_tide_right_prompt_separator_diff_color  - case 2 - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - case 3 - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - case 4 - 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/common/.config/fish/functions/tide/configure/configs/classic.fish b/common/.config/fish/functions/tide/configure/configs/classic.fish deleted file mode 100644 index f844676..0000000 --- a/common/.config/fish/functions/tide/configure/configs/classic.fish +++ /dev/null @@ -1,151 +0,0 @@ -tide_aws_bg_color 444444 -tide_aws_color FF9900 -tide_aws_icon  -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color 444444 -tide_chruby_color B31209 -tide_chruby_icon  -tide_cmd_duration_bg_color 444444 -tide_cmd_duration_color 87875F -tide_cmd_duration_decimals 0 -tide_cmd_duration_icon -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_crystal_icon ⬢ -tide_direnv_bg_color 444444 -tide_direnv_bg_color_denied 444444 -tide_direnv_color $_tide_color_gold -tide_direnv_color_denied FF0000 -tide_direnv_icon ▼ -tide_distrobox_bg_color 444444 -tide_distrobox_color FF00FF -tide_distrobox_icon ⬢ -tide_docker_bg_color 444444 -tide_docker_color 2496ED -tide_docker_default_contexts default colima -tide_docker_icon  -tide_elixir_bg_color 444444 -tide_elixir_color 4E2A8E -tide_elixir_icon  -tide_gcloud_bg_color 444444 -tide_gcloud_color 4285F4 -tide_gcloud_icon  -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_icon -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color 444444 -tide_go_color 00ACD7 -tide_go_icon  -tide_java_bg_color 444444 -tide_java_color ED8B00 -tide_java_icon  -tide_jobs_bg_color 444444 -tide_jobs_color $_tide_color_dark_green -tide_jobs_icon  -tide_kubectl_bg_color 444444 -tide_kubectl_color 326CE5 -tide_kubectl_icon ⎈ -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_nix_shell_icon  -tide_node_bg_color 444444 -tide_node_color 44883E -tide_node_icon ⬢ -tide_os_bg_color 444444 -tide_os_color EEEEEE -tide_os_icon $os_branding_icon -tide_php_bg_color 444444 -tide_php_color 617CBE -tide_php_icon  -tide_private_mode_bg_color 444444 -tide_private_mode_color FFFFFF -tide_private_mode_icon 﫸 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' -tide_prompt_min_cols 34 -tide_prompt_pad_items true -tide_pulumi_bg_color 444444 -tide_pulumi_color F7BF2A -tide_pulumi_icon '' -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_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  -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 -tide_right_prompt_frame_enabled true -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir -tide_right_prompt_prefix  -tide_right_prompt_separator_diff_color  -tide_right_prompt_separator_same_color  -tide_right_prompt_suffix '' -tide_rustc_bg_color 444444 -tide_rustc_color F74C00 -tide_rustc_icon  -tide_shlvl_bg_color 444444 -tide_shlvl_color d78700 -tide_shlvl_icon  -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_status_icon ✔ -tide_status_icon_failure ✘ -tide_terraform_bg_color 444444 -tide_terraform_color 844FBA -tide_terraform_icon -tide_time_bg_color 444444 -tide_time_color 5F8787 -tide_time_format %T -tide_toolbox_bg_color 444444 -tide_toolbox_color 613583 -tide_toolbox_icon ⬢ -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_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color 444444 -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/common/.config/fish/functions/tide/configure/configs/classic_16color.fish b/common/.config/fish/functions/tide/configure/configs/classic_16color.fish deleted file mode 100644 index 6043117..0000000 --- a/common/.config/fish/functions/tide/configure/configs/classic_16color.fish +++ /dev/null @@ -1,87 +0,0 @@ -tide_aws_bg_color black -tide_aws_color yellow -tide_character_color brgreen -tide_character_color_failure brred -tide_chruby_bg_color black -tide_chruby_color red -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_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_virtual_env_bg_color black -tide_virtual_env_color cyan diff --git a/common/.config/fish/functions/tide/configure/configs/lean.fish b/common/.config/fish/functions/tide/configure/configs/lean.fish deleted file mode 100644 index 853bde9..0000000 --- a/common/.config/fish/functions/tide/configure/configs/lean.fish +++ /dev/null @@ -1,151 +0,0 @@ -tide_aws_bg_color normal -tide_aws_color FF9900 -tide_aws_icon  -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color normal -tide_chruby_color B31209 -tide_chruby_icon  -tide_cmd_duration_bg_color normal -tide_cmd_duration_color 87875F -tide_cmd_duration_decimals 0 -tide_cmd_duration_icon -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_crystal_icon ⬢ -tide_direnv_bg_color normal -tide_direnv_bg_color_denied normal -tide_direnv_color $_tide_color_gold -tide_direnv_color_denied FF0000 -tide_direnv_icon ▼ -tide_distrobox_bg_color normal -tide_distrobox_color FF00FF -tide_distrobox_icon ⬢ -tide_docker_bg_color normal -tide_docker_color 2496ED -tide_docker_default_contexts default colima -tide_docker_icon  -tide_elixir_bg_color normal -tide_elixir_color 4E2A8E -tide_elixir_icon  -tide_gcloud_bg_color normal -tide_gcloud_color 4285F4 -tide_gcloud_icon  -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_icon -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color normal -tide_go_color 00ACD7 -tide_go_icon  -tide_java_bg_color normal -tide_java_color ED8B00 -tide_java_icon  -tide_jobs_bg_color normal -tide_jobs_color $_tide_color_dark_green -tide_jobs_icon  -tide_kubectl_bg_color normal -tide_kubectl_color 326CE5 -tide_kubectl_icon ⎈ -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_nix_shell_icon  -tide_node_bg_color normal -tide_node_color 44883E -tide_node_icon ⬢ -tide_os_bg_color normal -tide_os_color normal -tide_os_icon $os_branding_icon -tide_php_bg_color normal -tide_php_color 617CBE -tide_php_icon  -tide_private_mode_bg_color normal -tide_private_mode_color FFFFFF -tide_private_mode_icon 﫸 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' -tide_prompt_min_cols 34 -tide_prompt_pad_items false -tide_pulumi_bg_color normal -tide_pulumi_color F7BF2A -tide_pulumi_icon '' -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_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  -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 -tide_right_prompt_frame_enabled false -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir -tide_right_prompt_prefix ' ' -tide_right_prompt_separator_diff_color ' ' -tide_right_prompt_separator_same_color ' ' -tide_right_prompt_suffix '' -tide_rustc_bg_color normal -tide_rustc_color F74C00 -tide_rustc_icon  -tide_shlvl_bg_color normal -tide_shlvl_color d78700 -tide_shlvl_icon  -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_status_icon ✔ -tide_status_icon_failure ✘ -tide_terraform_bg_color normal -tide_terraform_color 844FBA -tide_terraform_icon -tide_time_bg_color normal -tide_time_color 5F8787 -tide_time_format %T -tide_toolbox_bg_color normal -tide_toolbox_color 613583 -tide_toolbox_icon ⬢ -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_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color normal -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/common/.config/fish/functions/tide/configure/configs/lean_16color.fish b/common/.config/fish/functions/tide/configure/configs/lean_16color.fish deleted file mode 100644 index 546868d..0000000 --- a/common/.config/fish/functions/tide/configure/configs/lean_16color.fish +++ /dev/null @@ -1,87 +0,0 @@ -tide_aws_bg_color normal -tide_aws_color yellow -tide_character_color brgreen -tide_character_color_failure brred -tide_chruby_bg_color normal -tide_chruby_color red -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_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_virtual_env_bg_color normal -tide_virtual_env_color cyan diff --git a/common/.config/fish/functions/tide/configure/configs/rainbow.fish b/common/.config/fish/functions/tide/configure/configs/rainbow.fish deleted file mode 100644 index 5087f36..0000000 --- a/common/.config/fish/functions/tide/configure/configs/rainbow.fish +++ /dev/null @@ -1,151 +0,0 @@ -tide_aws_bg_color FF9900 -tide_aws_color 232F3E -tide_aws_icon  -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color B31209 -tide_chruby_color 000000 -tide_chruby_icon  -tide_cmd_duration_bg_color C4A000 -tide_cmd_duration_color 000000 -tide_cmd_duration_decimals 0 -tide_cmd_duration_icon -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_crystal_icon ⬢ -tide_direnv_bg_color $_tide_color_gold -tide_direnv_bg_color_denied FF0000 -tide_direnv_color 000000 -tide_direnv_color_denied 000000 -tide_direnv_icon ▼ -tide_distrobox_bg_color FF00FF -tide_distrobox_color 000000 -tide_distrobox_icon ⬢ -tide_docker_bg_color 2496ED -tide_docker_color 000000 -tide_docker_default_contexts default colima -tide_docker_icon  -tide_elixir_bg_color 4E2A8E -tide_elixir_color 000000 -tide_elixir_icon  -tide_gcloud_bg_color 4285F4 -tide_gcloud_color 000000 -tide_gcloud_icon  -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_icon -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color 00ACD7 -tide_go_color 000000 -tide_go_icon  -tide_java_bg_color ED8B00 -tide_java_color 000000 -tide_java_icon  -tide_jobs_bg_color 444444 -tide_jobs_color 4E9A06 -tide_jobs_icon  -tide_kubectl_bg_color 326CE5 -tide_kubectl_color 000000 -tide_kubectl_icon ⎈ -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_nix_shell_icon  -tide_node_bg_color 44883E -tide_node_color 000000 -tide_node_icon ⬢ -tide_os_bg_color $os_branding_bg_color -tide_os_color $os_branding_color -tide_os_icon $os_branding_icon -tide_php_bg_color 617CBE -tide_php_color 000000 -tide_php_icon  -tide_private_mode_bg_color F1F3F4 -tide_private_mode_color 000000 -tide_private_mode_icon 﫸 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' -tide_prompt_min_cols 34 -tide_prompt_pad_items true -tide_pulumi_bg_color F7BF2A -tide_pulumi_color 000000 -tide_pulumi_icon '' -tide_pwd_bg_color 3465A4 -tide_pwd_color_anchors E4E4E4 -tide_pwd_color_dirs E4E4E4 -tide_pwd_color_truncated_dirs BCBCBC -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  -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 -tide_right_prompt_frame_enabled true -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir -tide_right_prompt_prefix  -tide_right_prompt_separator_diff_color  -tide_right_prompt_separator_same_color  -tide_right_prompt_suffix '' -tide_rustc_bg_color F74C00 -tide_rustc_color 000000 -tide_rustc_icon  -tide_shlvl_bg_color 808000 -tide_shlvl_color 000000 -tide_shlvl_icon  -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_status_icon ✔ -tide_status_icon_failure ✘ -tide_terraform_bg_color 800080 -tide_terraform_color 000000 -tide_terraform_icon -tide_time_bg_color D3D7CF -tide_time_color 000000 -tide_time_format %T -tide_toolbox_bg_color 613583 -tide_toolbox_color 000000 -tide_toolbox_icon ⬢ -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_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color 444444 -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/common/.config/fish/functions/tide/configure/configs/rainbow_16color.fish b/common/.config/fish/functions/tide/configure/configs/rainbow_16color.fish deleted file mode 100644 index 7803596..0000000 --- a/common/.config/fish/functions/tide/configure/configs/rainbow_16color.fish +++ /dev/null @@ -1,91 +0,0 @@ -tide_aws_bg_color yellow -tide_aws_color brblack -tide_character_color brgreen -tide_character_color_failure brred -tide_chruby_bg_color red -tide_chruby_color black -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_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_virtual_env_bg_color brblack -tide_virtual_env_color cyan diff --git a/common/.config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish deleted file mode 100644 index 4661ab1..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish +++ /dev/null @@ -1,41 +0,0 @@ -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/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish deleted file mode 100644 index 73ae055..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_character.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _fake_tide_item_character - set_color $fake_tide_character_color - contains newline $fake_tide_left_prompt_items || echo -ns ' ' - echo -ns $fake_tide_character_icon -end diff --git a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish deleted file mode 100644 index 5aa13b2..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_cmd_duration - _fake_tide_print_item cmd_duration $fake_tide_cmd_duration_icon' ' 5s -end diff --git a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish deleted file mode 100644 index fb5b957..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_git.fish +++ /dev/null @@ -1,3 +0,0 @@ -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/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish deleted file mode 100644 index c614bab..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish +++ /dev/null @@ -1,5 +0,0 @@ -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/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish deleted file mode 100644 index 5255721..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_os.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_os - _fake_tide_print_item os $fake_tide_os_icon -end diff --git a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish deleted file mode 100644 index bbce0b5..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_item_time.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_time - _fake_tide_print_item time (date +$fake_tide_time_format) -end diff --git a/common/.config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish deleted file mode 100644 index 30cd024..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_print_item.fish +++ /dev/null @@ -1,22 +0,0 @@ -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/common/.config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish deleted file mode 100644 index 11f20ca..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_prompt.fish +++ /dev/null @@ -1,42 +0,0 @@ -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/common/.config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish b/common/.config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish deleted file mode 100644 index 433eafa..0000000 --- a/common/.config/fish/functions/tide/configure/functions/_fake_tide_pwd.fish +++ /dev/null @@ -1,11 +0,0 @@ -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/common/.config/fish/functions/update-homes.fish b/common/.config/fish/functions/update-homes.fish old mode 100644 new mode 100755 index 34437b9..f2d49cf --- a/common/.config/fish/functions/update-homes.fish +++ b/common/.config/fish/functions/update-homes.fish @@ -1,9 +1,48 @@ #!/usr/bin/env fish -function update-homes - argparse 'h/help' 'g/git' 'd/desktop' 'p/private' 'r/root' 'R/remove' 's/skip-secrets' -- $argv +function update-homes -d "Update homes configuration" + argparse 'h/help' 'g/git' 'd/desktop' 'r/root' 'R/remove' 'i/install' -- $argv - if set --query _flag_help + set -f homes_path ~/homes + set -f homes_private_path ~/homes-private + + if set -q HOMES_PATH + set -f homes_path $HOMES_PATH + end + + if set -q HOMES_PRIVATE_PATH + set -f homes_private_path $HOMES_PRIVATE_PATH + end + + if not test -d $homes_path + echo (set_color c94f6d)"*** ERROR ***"(set_color normal) + echo "*** $homes_path does not exists" + return + end + + if not test -n homes_path + echo (set_color c94f6d)"*** ERROR ***"(set_color normal) + echo "*** HOMES_PATH variable is empty" + return + end + + if not test -n homes_private_path + echo (set_color c94f6d)"*** ERROR ***"(set_color normal) + echo "*** HOMES_PRIVATE_PATH is empty, unset or change it" + return + end + + if not test -d $homes_private_path + echo (set_color f4a261)"*** WARNING ***"(set_color normal) + echo "*** $homes_private_path does not exist" + end + + if not functions -q update-homes-secrets + echo (set_color f4a261)"*** WARNING ***"(set_color normal) + echo "*** update-homes-secrets is not defined" + end + + if set -q _flag_help echo "Update home's configuration" echo echo "You need to have homes and homes-private in your home directory." @@ -15,55 +54,126 @@ function update-homes echo " -d --desktop" echo " Update desktop part" echo - echo " -p --private" - echo " Update private part" - echo echo " -r --root" echo " Update root part" echo - echo " -s --skip-secrets" - echo " Skip homes-private part" - echo echo " -R --remove" echo " Remove old configuration" echo + echo " -i --install" + echo " Install user packages and softwares" + echo echo " -h --help" echo " Show this screen" return end - pushd ~/homes - if set --query _flag_git + if set -q _flag_install + mkdir -p ~/.cache + go install github.com/jesseduffield/lazydocker@latest + go install github.com/jesseduffield/lazygit@latest + + rm -rf ~/.cache/nvimpager-git + git clone --depth 1 https://github.com/lucc/nvimpager ~/.cache/nvimpager-git + pushd ~/.cache/nvimpager-git + make PREFIX=$HOME/.local install + popd + rm -rf ~/.cache/nvimpager-git + end + + if set -q _flag_desktop && set -q _flag_install + pip install --user --break-system-packages -U poezio-omemo epr-reader + + rm -rf ~/.local/share/poezio/plugins + mkdir -p ~/.local/share/poezio + + set -l poezio_version $(poezio --version | cut -d " " -f 2) + rm -rf ~/.cache/poezio-git + git clone --depth 1 https://codeberg.org/poezio/poezio ~/.cache/poezio-git + pushd ~/.cache/poezio-git + git checkout $poezio_version + popd + cp -r ~/.cache/poezio-git/plugins ~/.local/share/poezio + rm -rf ~/.cache/poezio-git + end + + if set -q _flag_remove + echo "**** Remove old config" + + # Remove zsh + rm ~/.zcompdump + rm -rf ~/.zsh* ~/.local/share/zsh + + # Remove old tmux files + rm -f ~/.tmux.conf ~/.tmux-theme + + rm -rf ~/.config/aerc + rm -rf ~/.config/fish + rm -rf ~/.config/khal + rm -rf ~/.config/khard + rm -rf ~/.config/lvim + rm -rf ~/.config/neomutt + rm -rf ~/.config/newsboat + rm -rf ~/.config/nvim + rm -rf ~/.config/poezio + rm -rf ~/.config/tmux + rm -rf ~/.config/toot + rm -rf ~/.config/vdirsyncer + end + + if set -q _flag_git + pushd $homes_path gitpr - end + popd - set -f options "" - if set --query _flag_desktop - set -f options "--desktop" - end - if set --query _flag_remove - set -f options "$options --remove" - end - if set --query _flag_root - set -f options "$options --root" - end - ./update-home.fish $options - popd - - if not set --query _flag_skip-secrets - pushd ~/homes-private - if set --query _flag_git + if test -d $homes_private_path + pushd $homes_private_path gitpr + popd end + end - set -f options "" - if set --query _flag_private - set -f options "--private" - end - if set --query _flag_root - set -f options "$options --root" - end - ./update-private.fish $options + echo "**** Copying common part" + if test -d $homes_path/common + pushd $homes_path + rsync --exclude=".*.swp" -av ./common/ ~/ popd end + if test -d $homes_private_path/common + pushd $homes_private_path + rsync --exclude=".*.swp" -av ./common/ ~/ + popd + end + + if set -q _flag_root + echo "**** Copying root part" + if test -d $homes_path/root + pushd $homes_path + rsync --exclude=".*.swp" -av ./root/ ~/ + popd + end + if test -d $homes_private_path/root + pushd $homes_private_path + rsync --exclude=".*.swp" -av ./root/ ~/ + popd + end + end + + if set -q _flag_desktop + echo "**** Copying desktop part" + if test -d $homes_path/desktop + pushd $homes_path + rsync --exclude=".*.swp" -av ./desktop/ ~/ + popd + end + if test -d $homes_private_path/desktop + pushd $homes_private_path + rsync --exclude=".*.swp" -av ./desktop/ ~/ + popd + end + end + + if functions -q update-homes-secrets + update-homes-secrets $_flag_desktop $_flag_root + end end diff --git a/desktop/.local/share/konsole/nightfox_konsole.colorscheme b/desktop/.local/share/konsole/nightfox_konsole.colorscheme index e3c29ef..a283471 100644 --- a/desktop/.local/share/konsole/nightfox_konsole.colorscheme +++ b/desktop/.local/share/konsole/nightfox_konsole.colorscheme @@ -92,4 +92,4 @@ Color=214,214,215 Blur=false ColorRandomization=false Description=Nightfox -Opacity=0.82 +Opacity=0.88 diff --git a/update-home.fish b/update-home.fish deleted file mode 100755 index 096cf74..0000000 --- a/update-home.fish +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env fish - -argparse 'R/remove' 'r/root' 'd/desktop' 'h/help' -- $argv - -if set --query _flag_help - echo "Update home with config files" - echo "WARNING: ERASE YOUR ACTUAL CONFIG" - echo - echo "Usage:" - echo "-d : copy desktop files" - echo "-r : copy root files" - echo "-R : remove old homes config" - echo "-h : this help" - echo - echo "You have to launch an other script to override secrets after" - exit -end - -mkdir -p ~/.cache - -if set --query _flag_desktop - # Copy the desktop part - echo "**** Copying desktop part" - rsync --exclude=".*.swp" -av ./desktop/ ~/ - pip install --user --break-system-packages -U poezio-omemo epr-reader - - rm -rf ~/.local/share/poezio/plugins - mkdir -p ~/.local/share/poezio - - set -l poezio_version $(poezio --version | cut -d " " -f 2) - rm -rf ~/.cache/poezio-git - git clone --depth 1 https://codeberg.org/poezio/poezio ~/.cache/poezio-git - pushd ~/.cache/poezio-git - git checkout $poezio_version - popd - cp -r ~/.cache/poezio-git/plugins ~/.local/share/poezio - rm -rf ~/.cache/poezio-git -end - -if set --query _flag_remove - echo "**** Remove old config" - - # Remove zsh - rm ~/.zcompdump - rm -rf ~/.zsh* ~/.local/share/zsh - - # Remove old tmux files - rm -f ~/.tmux.conf ~/.tmux-theme - - rm -f ~/.config/fish/cd.fish -end - -if set --query _flag_root - echo "**** Copying root part" - rsync --exclude=".*.swp" -av ./root/ ~/ -end - -go install github.com/jesseduffield/lazydocker@latest -go install github.com/jesseduffield/lazygit@latest - -rm -rf ~/.cache/nvimpager-git -git clone --depth 1 https://github.com/lucc/nvimpager ~/.cache/nvimpager-git -pushd ~/.cache/nvimpager-git -make PREFIX=$HOME/.local install -popd -rm -rf ~/.cache/nvimpager-git - -# Copy the common part -rsync --exclude=".*.swp" -av ./common/ ~/ diff --git a/update-homes-secrets-example.fish b/update-homes-secrets-example.fish new file mode 100755 index 0000000..b994c53 --- /dev/null +++ b/update-homes-secrets-example.fish @@ -0,0 +1,51 @@ +#!/usr/bin/env fish + +# Template for update-homes-secrets +# To place in ~/homes-private/common/.config/fish/functions +# +# This example assumes this folder exists: +# - ~/homes-private +# +# Note: you can change path with env variables +# HOMES_PATH and HOMES_PRIVATE_PATH +# +# Please create your own private repository for secrets + +function update-homes-secrets -d "Update secrets for configuration of homes" + argparse 'h/help' 'd/desktop' 'r/root' -- $argv + + if set -q _flag_help + echo "Update home's configuration" + echo + echo "You need to have homes and homes-private in your home directory." + echo "This function launch the two scripts to update your conf." + echo + echo " -d --desktop" + echo " Update desktop part" + echo + echo " -r --root" + echo " Update root part" + echo + echo " -h --help" + echo " Show this screen" + return + end + + if set --query _flag_desktop + echo "*** Set secrets" + + sed -i "s/REPLACE_DEVICE_HOSTNAME/`hostname`/g" ~/.config/poezio/poezio.cfg + sed -i "s/REPLACE_FINGERPRINT/cert_fingerprint/g" ~/.config/poezio/poezio.cfg + sed -i "s/REPLACE_JID/template@example.com/g" ~/.config/poezio/poezio.cfg + sed -i "s/KEYRING_ID/xmpp:template@example.com/g" ~/.config/poezio/poezio.cfg + sed -i "s/KEYRING_USER/template@example.com/g" ~/.config/poezio/poezio.cfg + + sed -i "s/FRESHRSSLOGIN/example_user/g" ~/.config/newsboat/config + sed -i "s/FRESHRSSKEEPASSXC/rss:freshrss.example.com/g" ~/.config/newsboat/config + sed -i "s/FRESHRSSURL/https:\/\/freshrss.example.com\/api\/greader.php/g" ~/.config/newsboat/config + end +end + +if set --query _flag_root + rsync --exclude=".*.swp" -av ./root/ ~/ +end diff --git a/update-private-example.fish b/update-private-example.fish deleted file mode 100755 index 1cdc743..0000000 --- a/update-private-example.fish +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env fish - -# Template for update-private.fish -# To place in ~/homes-private -# -# This example assumes these folders exist: -# - ~/homes-private/private -# - ~/homes-private/root -# -# Please create your own private repository for secrets - -argparse 'r/root' 'p/private' 'h/help' -- $argv - -if set --query _flag_help - echo "Update home with config files" - echo "WARNING: ERASE YOUR ACTUAL CONFIG" - echo - echo "Usage:" - echo "-p : private files" - echo "-r : copy root files" - echo "-h : this help" - echo - exit -end - -if set --query _flag_private - # Copy the private part - echo "**** Copying private part" - rsync --exclude=".*.swp" -av ./private/ ~/ - - sed -i "s/REPLACE_DEVICE_HOSTNAME/`hostname`/g" ~/.config/poezio/poezio.cfg - sed -i "s/REPLACE_FINGERPRINT/cert_fingerprint/g" ~/.config/poezio/poezio.cfg - sed -i "s/REPLACE_JID/template@example.com/g" ~/.config/poezio/poezio.cfg - sed -i "s/KEYRING_ID/xmpp:template@example.com/g" ~/.config/poezio/poezio.cfg - sed -i "s/KEYRING_USER/template@example.com/g" ~/.config/poezio/poezio.cfg - - sed -i "s/FRESHRSSLOGIN/example_user/g" ~/.config/newsboat/config - sed -i "s/FRESHRSSKEEPASSXC/rss:freshrss.example.com/g" ~/.config/newsboat/config - sed -i "s/FRESHRSSURL/https:\/\/freshrss.example.com\/api\/greader.php/g" ~/.config/newsboat/config -end - -if set --query _flag_root - rsync --exclude=".*.swp" -av ./root/ ~/ -end diff --git a/update.fish b/update.fish new file mode 100755 index 0000000..1c513b3 --- /dev/null +++ b/update.fish @@ -0,0 +1,12 @@ +#!/usr/bin/env fish + + +echo "Only for first use." +echo "Use directly update-homes function after." + +echo +echo +echo + +source common/.config/fish/functions/update-homes.fish +update-homes $argv