From fcd217c19794f02018636e9267eddf55a562f285 Mon Sep 17 00:00:00 2001 From: Jan Klass Date: Mon, 31 Oct 2022 15:41:28 +0100 Subject: [PATCH 1/3] docs(config): Replace misleading $all reference (#4519) In the config `$all` has special meaning, as it is and contains the default value for `format`. Using `$all` in the example for conditional format strings with multiple variables is thus potentially misleading and confusing. Using a neutral variable `$combined` has no conflict with other meanings and is thus preferable. --- docs/config/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/README.md b/docs/config/README.md index b1adce8e5..bdf1dda45 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -124,7 +124,7 @@ For example: - `(@$region)` will show nothing if the variable `region` is `None` or empty string, otherwise `@` followed by the value of region. - `(some text)` will always show nothing since there are no variables wrapped in the braces. -- When `$all` is a shortcut for `\[$a$b\]`, `($all)` will show nothing only if `$a` and `$b` are both `None`. +- When `$combined` is a shortcut for `\[$a$b\]`, `($combined)` will show nothing only if `$a` and `$b` are both `None`. This works the same as `(\[$a$b\] )`. #### Special characters From d3cf18ffe9658debd234350582bbdf7c83766c2a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 18:08:02 +0000 Subject: [PATCH 2/3] build(deps): update dependency taplo-cli to 0.8.0 --- .github/workflows/format-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/format-workflow.yml b/.github/workflows/format-workflow.yml index ffde218d2..110d3ca71 100644 --- a/.github/workflows/format-workflow.yml +++ b/.github/workflows/format-workflow.yml @@ -24,7 +24,7 @@ jobs: - name: Setup | Checkout uses: actions/checkout@v3 - name: Install | Taplo - run: cargo install --debug --locked --version 0.7.2 taplo-cli + run: cargo install --debug --locked --version 0.8.0 taplo-cli - name: Presets | Validate with schema run: taplo lint --schema "file://${GITHUB_WORKSPACE}/.github/config-schema.json" docs/.vuepress/public/presets/toml/*.toml From 4d86a4c7ae70dff552cdea85d7ea7872e2321c2f Mon Sep 17 00:00:00 2001 From: Segev Finer Date: Tue, 1 Nov 2022 09:38:46 +0200 Subject: [PATCH 3/3] feat(preset): Add no-nerd-font preset (#4517) * feat(preset): Add powerline-only-symbols preset Related to #2563 & #3544 * Modify symbols for pulumi and erlang * Change some wording and add default notification * Update name of preset Co-authored-by: Kevin Song --- .../public/presets/toml/no-nerd-font.toml | 15 ++++++++++++++ docs/presets/README.md | 11 ++++++++++ docs/presets/no-nerd-font.md | 20 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 docs/.vuepress/public/presets/toml/no-nerd-font.toml create mode 100644 docs/presets/no-nerd-font.md diff --git a/docs/.vuepress/public/presets/toml/no-nerd-font.toml b/docs/.vuepress/public/presets/toml/no-nerd-font.toml new file mode 100644 index 000000000..a34b30443 --- /dev/null +++ b/docs/.vuepress/public/presets/toml/no-nerd-font.toml @@ -0,0 +1,15 @@ +[battery] +full_symbol = "• " +charging_symbol = "⇡ " +discharging_symbol = "⇣ " +unknown_symbol = "❓ " +empty_symbol = "❗ " + +[erlang] +symbol = "ⓔ " + +[nodejs] +symbol = "[⬢](bold green) " + +[pulumi] +symbol = "🧊 " diff --git a/docs/presets/README.md b/docs/presets/README.md index 88001ae61..b003069f2 100644 --- a/docs/presets/README.md +++ b/docs/presets/README.md @@ -11,6 +11,17 @@ This preset changes the symbols for each module to use Nerd Font symbols. [![Screenshot of Nerd Font Symbols preset](/presets/img/nerd-font-symbols.png "Click to view Nerd Font Symbols preset")](./nerd-font) +## [No Nerd Fonts](./no-nerd-font.md) + +This preset changes the symbols for several modules so that no Nerd Font symbols +are used anywhere in the prompt. + +::: tip +This preset will become the default preset [in a future release of starship](https://github.com/starship/starship/pull/3544). +::: + +[Click to view No Nerd Font preset](./no-nerd-font) + ## [Bracketed Segments](./bracketed-segments.md) This preset changes the format of all the built-in modules to show their segment diff --git a/docs/presets/no-nerd-font.md b/docs/presets/no-nerd-font.md new file mode 100644 index 000000000..7c97a6089 --- /dev/null +++ b/docs/presets/no-nerd-font.md @@ -0,0 +1,20 @@ +[Return to Presets](./README.md#no-nerd-fonts) + +# No Nerd Fonts Preset + +This preset restricts the use of symbols to those from emoji and powerline sets. + +This means that even without a Nerd Font installed, you should be able to view +all module symbols. + +This preset will become the default preset in a future release of starship. + +### Configuration + +```sh +starship preset no-nerd-font > ~/.config/starship.toml +``` + +[Click to download TOML](/presets/toml/no-nerd-font.toml) + +<<< @/.vuepress/public/presets/toml/no-nerd-font.toml