diff --git a/README.md b/README.md index 10ceaf6..3e09516 100644 --- a/README.md +++ b/README.md @@ -175,23 +175,23 @@ Open each file and click "Install". This will make the `Sauce Code Pro` font ava Tide was inspired by [Powerlevel10k][]. Powerlevel10k is widely recognized as one of the best Zsh themes—blazing fast, infinitely flexible, and supremely powerful. Tide was created to bring a portion of that greatness to Fish. Though no code is adopted, much of Tide's documentation, ideas, and design elements are borrowed from Powerlevel10k. -[release_badge]: https://img.shields.io/github/v/release/IlanCosman/tide?label=%20 -[releases]: https://github.com/IlanCosman/tide/releases -[fish_version_badge]: https://img.shields.io/badge/fish-3.1.0%2B-blue -[license_badge]: https://img.shields.io/github/license/IlanCosman/tide +[release_badge]: img.shields.io/github/v/release/IlanCosman/tide?label=%20 +[releases]: github.com/IlanCosman/tide/releases +[fish_version_badge]: img.shields.io/badge/fish-3.1.0%2B-blue +[license_badge]: img.shields.io/github/license/IlanCosman/tide [license]: /LICENSE.md -[fish]: https://github.com/fish-shell/fish-shell +[fish]: github.com/fish-shell/fish-shell [prompt_connection]: /resources/images/Prompt_Connection.png -[git]: https://github.com/git/git +[git]: github.com/git/git [configuration_wizard]: /resources/svgs/Configuration_Wizard.svg [multi-line_right_prompt]: /resources/images/Multi-Line_Right_Prompt.png -[pure]: https://github.com/rafaelrinaldi/pure +[pure]: github.com/rafaelrinaldi/pure [pure_compatibility]: /resources/svgs/Pure_Compatibility.svg [extensible]: /resources/images/Extensible.png -[contributing guide]: https://github.com/IlanCosman/tide/blob/master/CONTRIBUTING.md -[fish_git_prompt]: https://fishshell.com/docs/current/cmds/fish_git_prompt.html -[sauce code pro regular.ttf]: https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Regular/complete/Sauce%20Code%20Pro%20Nerd%20Font%20Complete.ttf -[sauce code pro bold.ttf]: https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Bold/complete/Sauce%20Code%20Pro%20Bold%20Nerd%20Font%20Complete.ttf -[sauce code pro italic.ttf]: https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Italic/complete/Sauce%20Code%20Pro%20Italic%20Nerd%20Font%20Complete.ttf -[sauce code pro bold-italic.ttf]: https://github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Bold-Italic/complete/Sauce%20Code%20Pro%20Bold%20Italic%20Nerd%20Font%20Complete.ttf -[powerlevel10k]: https://github.com/romkatv/powerlevel10k/ +[contributing guide]: github.com/IlanCosman/tide/blob/master/CONTRIBUTING.md +[fish_git_prompt]: fishshell.com/docs/current/cmds/fish_git_prompt.html +[sauce code pro regular.ttf]: github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Regular/complete/Sauce%20Code%20Pro%20Nerd%20Font%20Complete.ttf +[sauce code pro bold.ttf]: github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Bold/complete/Sauce%20Code%20Pro%20Bold%20Nerd%20Font%20Complete.ttf +[sauce code pro italic.ttf]: github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Italic/complete/Sauce%20Code%20Pro%20Italic%20Nerd%20Font%20Complete.ttf +[sauce code pro bold-italic.ttf]: github.com/ryanoasis/nerd-fonts/raw/master/patched-fonts/SourceCodePro/Bold-Italic/complete/Sauce%20Code%20Pro%20Bold%20Italic%20Nerd%20Font%20Complete.ttf +[powerlevel10k]: github.com/romkatv/powerlevel10k/ diff --git a/tide_theme/configure/choices/all/prompt_spacing.fish b/tide_theme/configure/choices/all/prompt_spacing.fish index f9a86d7..15317fa 100644 --- a/tide_theme/configure/choices/all/prompt_spacing.fish +++ b/tide_theme/configure/choices/all/prompt_spacing.fish @@ -14,10 +14,10 @@ function prompt_spacing switch (_menu 'Choice' 1/2/r/q) case 1 - set -g fake_tide_newline false + set -g fake_tide_print_newline_before_prompt false _next_choice 'all/finish' case 2 - set -g fake_tide_newline true + set -g fake_tide_print_newline_before_prompt true _next_choice 'all/finish' case r _begin diff --git a/tide_theme/configure/configs/lean.fish b/tide_theme/configure/configs/lean.fish index b2c8e7e..1d4fe45 100644 --- a/tide_theme/configure/configs/lean.fish +++ b/tide_theme/configure/configs/lean.fish @@ -3,7 +3,7 @@ set -l tideColorGold D7AF00 set -l tideColorDarkerGreen 5FAF00 # ---------------General Theme Variables--------------- -_set fake_tide_newline 'true' +_set fake_tide_print_newline_before_prompt 'true' # ------------Left Prompt------------ _set fake_tide_left_prompt_prefix '' _set fake_tide_left_prompt_items 'pwd' 'git_prompt' 'newline' 'prompt_char' diff --git a/tide_theme/configure/configs/pure.fish b/tide_theme/configure/configs/pure.fish index 99b4e50..16f3c69 100644 --- a/tide_theme/configure/configs/pure.fish +++ b/tide_theme/configure/configs/pure.fish @@ -3,7 +3,7 @@ set -l tideColorGold D7AF00 set -l tideColorDarkerGreen 5FAF00 # ---------------General Theme Variables--------------- -_set fake_tide_newline 'true' +_set fake_tide_print_newline_before_prompt 'true' # ------------Left Prompt------------ _set fake_tide_left_prompt_prefix '' _set fake_tide_left_prompt_items 'pwd' 'git_prompt' 'cmd_duration' 'newline' 'prompt_char' diff --git a/tide_theme/configure/fish_prompt.fish b/tide_theme/configure/fish_prompt.fish index 9101169..35287ee 100644 --- a/tide_theme/configure/fish_prompt.fish +++ b/tide_theme/configure/fish_prompt.fish @@ -3,12 +3,12 @@ function fish_prompt --description 'Write out the prompt' set -g _tide_last_pipestatus $pipestatus set -g _tide_last_status $status - if test "$tide_newline" = 'true' + if test "$tide_print_newline_before_prompt" = 'true' printf '%b' '\n' end set_color $tide_prompt_connection_color - string repeat --count $COLUMNS --no-newline $tide_prompt_connection_icon + string repeat --no-newline --max $COLUMNS $tide_prompt_connection_icon printf '%b' '\r' _tide_right_prompt diff --git a/tide_theme/functions/configure.fish b/tide_theme/functions/configure.fish index a9f9cf2..70888ac 100644 --- a/tide_theme/functions/configure.fish +++ b/tide_theme/functions/configure.fish @@ -27,9 +27,9 @@ end function _set_defaults if test $fake_lines -ge 26 - set -g fake_tide_newline true + set -g fake_tide_print_newline_before_prompt true else - set -g fake_tide_newline false + set -g fake_tide_print_newline_before_prompt false end set -g fake_tide_left_prompt_items 'pwd' 'git_prompt' 'newline' 'prompt_char' diff --git a/tools/tide_actual_install.fish b/tools/tide_actual_install.fish index 9d5802d..d89e550 100644 --- a/tools/tide_actual_install.fish +++ b/tools/tide_actual_install.fish @@ -82,7 +82,7 @@ function _set_immutables set -a _tide_file_list (string replace "$tempDir/" '' $file) end - _set_immutable _tide_version 1.4.0 + _set_immutable _tide_version 2.0.0 _set_immutable _tide_dir "$__fish_config_dir/tide_theme" # --------------Colors-------------- _set_immutable _tide_color_green 5FD700