Merge branch 'master' into conditional-style

.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
 

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 = "🧊 "

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

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

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