diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 906b2bf..da59171 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,9 +9,8 @@ #### Motivation and Context - -Closes # +Closes # #### Screenshots (if appropriate) @@ -20,8 +19,8 @@ Closes # -- [ ] I have tested using **MacOS**. - [ ] I have tested using **Linux**. +- [ ] I have tested using **MacOS**. #### Checklist diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 63f8ab0..3a8f9dc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,10 +81,10 @@ For example Tide might: - Make small non-backwards compatible changes in a minor version bump - Not bump the patch version number for ultra minor fixes -[code of conduct]: CODE_OF_CONDUCT.md -[fishtape]: https://github.com/jorgebucaran/fishtape [`fish --no-execute`]: https://fishshell.com/docs/current/cmds/fish.html [`fish_indent`]: https://fishshell.com/docs/current/cmds/fish_indent.html +[code of conduct]: CODE_OF_CONDUCT.md +[fishtape]: https://github.com/jorgebucaran/fishtape [markdownlint]: https://github.com/DavidAnson/markdownlint [prettier]: https://github.com/prettier/prettier [reference style]: https://www.markdownguide.org/basic-syntax/#reference-style-links diff --git a/README.md b/README.md index 9a2e95c..f248801 100644 --- a/README.md +++ b/README.md @@ -145,18 +145,18 @@ Open each file and click "Install". This will make the `MesloLGS NF` font availa [ci_badge]: https://github.com/IlanCosman/tide/workflows/CI/badge.svg [configuration_wizard]: https://raw.githubusercontent.com/IlanCosman/tide-resources/main/animations/configuration_wizard.gif [contributing guide]: CONTRIBUTING.md -[fish]: https://fishshell.com/ [fish_version_badge]: https://img.shields.io/badge/fish-3.1.0%2B-blue +[fish]: https://fishshell.com/ [git]: https://git-scm.com/ -[license]: LICENSE.md +[items]: https://github.com/IlanCosman/tide/wiki/Items [license_badge]: https://img.shields.io/github/license/IlanCosman/tide -[meslolgs nf bold.ttf]: https://raw.githubusercontent.com/IlanCosman/tide-resources/main/fonts/mesloLGS_NF_bold.ttf +[license]: LICENSE.md [meslolgs nf bold italic.ttf]: https://raw.githubusercontent.com/IlanCosman/tide-resources/main/fonts/mesloLGS_NF_bold_italic.ttf +[meslolgs nf bold.ttf]: https://raw.githubusercontent.com/IlanCosman/tide-resources/main/fonts/mesloLGS_NF_bold.ttf [meslolgs nf italic.ttf]: https://raw.githubusercontent.com/IlanCosman/tide-resources/main/fonts/mesloLGS_NF_italic.ttf [meslolgs nf regular.ttf]: https://raw.githubusercontent.com/IlanCosman/tide-resources/main/fonts/mesloLGS_NF_regular.ttf [nerd fonts]: https://github.com/ryanoasis/nerd-fonts [powerlevel10k]: https://github.com/romkatv/powerlevel10k/ -[items]: https://github.com/IlanCosman/tide/wiki/Items [pure]: https://github.com/rafaelrinaldi/pure [spacefish]: https://github.com/matchai/spacefish [starship]: https://github.com/starship/starship diff --git a/conf.d/_tide_Ω_init.fish b/conf.d/_tide_Ω_init.fish index bc986fd..a6b2523 100644 --- a/conf.d/_tide_Ω_init.fish +++ b/conf.d/_tide_Ω_init.fish @@ -1,7 +1,7 @@ _tide_count_left_prompt_height +_tide_detect_os + _tide_git_prompt_set_vars -_tide_pwd - -_tide_detect_os \ No newline at end of file +_tide_pwd \ No newline at end of file diff --git a/functions/_tide_item_virtual_env.fish b/functions/_tide_item_virtual_env.fish index aa41526..f370ffe 100644 --- a/functions/_tide_item_virtual_env.fish +++ b/functions/_tide_item_virtual_env.fish @@ -5,9 +5,9 @@ function _tide_item_virtual_env set_color $tide_virtual_env_color if test "$tide_virtual_env_display_mode" = 'projectName' - printf '%s' {$tide_virtual_env_icon}' ' $splitVirtualEnv[-2] + printf '%s' $tide_virtual_env_icon' ' $splitVirtualEnv[-2] else if test "$tide_virtual_env_display_mode" = 'venvName' - printf '%s' {$tide_virtual_env_icon}' ' $splitVirtualEnv[-1] + printf '%s' $tide_virtual_env_icon' ' $splitVirtualEnv[-1] end end end \ No newline at end of file diff --git a/functions/_tide_right_prompt.fish b/functions/_tide_right_prompt.fish index 492c776..1637071 100644 --- a/functions/_tide_right_prompt.fish +++ b/functions/_tide_right_prompt.fish @@ -1,5 +1,5 @@ function _tide_right_prompt - set -l splitText (_tide_fetch_right_prompt_items | string split '@NEWLINE@') + set -l splitText (_tide_fetch_right_prompt_items) set -l printAtEndedRightPromptHeight (count $splitText) if test "$tide_right_prompt_frame_enabled" = 'true' @@ -105,10 +105,6 @@ function _tide_fetch_right_prompt_items end end -function fish_right_prompt - printf '%s' $_tide_fish_right_prompt_display -end - function _tide_print_at_end -a text set -l startLocation (math $COLUMNS -(_tide_decolor $text | string length)) _tide_cursor_right $startLocation diff --git a/tide_theme/configure/fish_prompt.fish b/tide_theme/configure/fish_prompt.fish index 35287ee..42ea8d1 100644 --- a/tide_theme/configure/fish_prompt.fish +++ b/tide_theme/configure/fish_prompt.fish @@ -13,4 +13,8 @@ function fish_prompt --description 'Write out the prompt' _tide_right_prompt _tide_left_prompt +end + +function fish_right_prompt + printf '%s' $_tide_fish_right_prompt_display end \ No newline at end of file diff --git a/tide_theme/configure/functions/fake_tide_right_prompt.fish b/tide_theme/configure/functions/fake_tide_right_prompt.fish index 172f9d1..ceb7fb3 100644 --- a/tide_theme/configure/functions/fake_tide_right_prompt.fish +++ b/tide_theme/configure/functions/fake_tide_right_prompt.fish @@ -1,5 +1,5 @@ function _fake_tide_right_prompt - set -l splitText (_tide_fetch_right_prompt_items | string split '@NEWLINE@') + set -l splitText (_tide_fetch_right_prompt_items) set -l printAtEndedRightPromptHeight (count $splitText) if test "$fake_tide_right_prompt_frame_enabled" = 'true' diff --git a/tools/_tide_actual_install.fish b/tools/_tide_actual_install.fish index 869831f..bd6a501 100644 --- a/tools/_tide_actual_install.fish +++ b/tools/_tide_actual_install.fish @@ -64,18 +64,19 @@ end function _set_immutables set -U _tide_var_immutable_list + _set_immutable _tide_color_dark_blue 0087AF + _set_immutable _tide_color_green 5FD700 + _set_immutable _tide_color_light_blue 00AFFF + _set_immutable _tide_color_normal (set_color normal) + + _set_immutable _tide_dir "$__fish_config_dir/tide_theme" + _set_immutable _tide_file_list (string replace "$tempDir/" '' $tempDir/{completions/*, conf.d/*, functions/*}) _set_immutable _tide_version 2.3.0 - _set_immutable _tide_dir "$__fish_config_dir/tide_theme" - # --------------Colors-------------- - _set_immutable _tide_color_green 5FD700 - _set_immutable _tide_color_light_blue 00AFFF - _set_immutable _tide_color_dark_blue 0087AF - _set_immutable _tide_color_normal (set_color normal) - _set_immutable VIRTUAL_ENV_DISABLE_PROMPT true _set_immutable NVM_DIR $HOME/.nvm + _set_immutable VIRTUAL_ENV_DISABLE_PROMPT true end function _set_immutable -a var_name