Merge branch 'master' into conditional-style

2025-01-19 04:48:17 +01:00 · 2023-05-17 14:52:56 +02:00 · 2023-05-17 14:52:56 +02:00 · 10a96e96df
commit 10a96e96df
parent e450384923 33ceced46d
14 changed files with 92 additions and 92 deletions
--- a/.dprint.json
+++ b/.dprint.json
@ -41,8 +41,8 @@
    "target/"
  ],
  "plugins": [
-    "https://github.com/dprint/dprint-plugin-typescript/releases/download/0.84.0/plugin.wasm",
-    "https://github.com/dprint/dprint-plugin-json/releases/download/0.17.1/plugin.wasm",
+    "https://github.com/dprint/dprint-plugin-typescript/releases/download/0.84.4/plugin.wasm",
+    "https://github.com/dprint/dprint-plugin-json/releases/download/0.17.2/plugin.wasm",
    "https://github.com/dprint/dprint-plugin-markdown/releases/download/0.15.2/plugin.wasm",
    "https://github.com/dprint/dprint-plugin-toml/releases/download/0.5.4/plugin.wasm"
  ]
--- a/.github/config-schema.json
+++ b/.github/config-schema.json
@ -30,7 +30,7 @@
        "format": "on [$symbol($subscription)]($style) ",
        "style": "blue bold",
        "subscription_aliases": {},
-        "symbol": "ﴃ "
+        "symbol": "󰠅 "
      },
      "allOf": [
        {
@ -40,9 +40,9 @@
    },
    "battery": {
      "default": {
-        "charging_symbol": " ",
+        "charging_symbol": "󰂄 ",
        "disabled": false,
-        "discharging_symbol": " ",
+        "discharging_symbol": "󰂃 ",
        "display": [
          {
            "charging_symbol": null,
@ -51,10 +51,10 @@
            "threshold": 10
          }
        ],
-        "empty_symbol": " ",
+        "empty_symbol": "󰂎 ",
        "format": "[$symbol$percentage]($style) ",
-        "full_symbol": " ",
-        "unknown_symbol": " "
+        "full_symbol": "󰁹 ",
+        "unknown_symbol": "󰁽 "
      },
      "allOf": [
        {
@ -1871,7 +1871,7 @@
          "type": "string"
        },
        "symbol": {
-          "default": "ﴃ ",
+          "default": "󰠅 ",
          "type": "string"
        },
        "style": {
@ -1896,23 +1896,23 @@
      "type": "object",
      "properties": {
        "full_symbol": {
-          "default": " ",
+          "default": "󰁹 ",
          "type": "string"
        },
        "charging_symbol": {
-          "default": " ",
+          "default": "󰂄 ",
          "type": "string"
        },
        "discharging_symbol": {
-          "default": " ",
+          "default": "󰂃 ",
          "type": "string"
        },
        "unknown_symbol": {
-          "default": " ",
+          "default": "󰁽 ",
          "type": "string"
        },
        "empty_symbol": {
-          "default": " ",
+          "default": "󰂎 ",
          "type": "string"
        },
        "display": {
--- a/.github/workflows/format-workflow.yml
+++ b/.github/workflows/format-workflow.yml
@ -35,7 +35,7 @@ jobs:
    if: ${{ github.event_name == 'pull_request' }}
    steps:
      - name: Prevent File Change
-        uses: xalvarez/prevent-file-change-action@v1.3.1
+        uses: xalvarez/prevent-file-change-action@v1.3.2
        if: ${{ github.event.pull_request.head.ref != 'i18n_master' }}
        with:
          githubToken: ${{ secrets.GITHUB_TOKEN }}
--- a/Cargo.lock
+++ b/Cargo.lock
@ -372,9 +372,9 @@ dependencies = [

 [[package]]
 name = "clap_complete"
-version = "4.2.1"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a19591b2ab0e3c04b588a0e04ddde7b9eaa423646d1b4a8092879216bf47473"
+checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8"
 dependencies = [
 "clap",
 ]
@ -964,12 +964,12 @@ dependencies = [

 [[package]]
 name = "gethostname"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "199523ba70af2b447640715e8c4bd2b5360313a71d2d69361ae4dd1dc31487dd"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
 dependencies = [
 "libc",
- "windows 0.48.0",
+ "windows-targets 0.48.0",
 ]

 [[package]]
@ -2643,18 +2643,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.162"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71b2f6e1ab5c2b98c05f0f35b236b22e8df7ead6ffbf51d7808da7f8817e7ab6"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.162"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a0814352fd64b58489904a44ea8d90cb1a91dcb6b4f5ebabc32c8318e93cb6"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -44,10 +44,10 @@ gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"]
 [dependencies]
 chrono = { version = "0.4.24", default-features = false, features = ["clock", "std", "wasmbind"] }
 clap = { version = "4.2.7", features = ["derive", "cargo", "unicode"] }
-clap_complete = "4.2.1"
+clap_complete = "4.2.3"
 dirs-next = "2.0.0"
 dunce = "1.0.4"
-gethostname = "0.4.2"
+gethostname = "0.4.3"
 # default feature restriction addresses https://github.com/starship/starship/issues/4251
 gix = { version = "0.44.1", default-features = false, features = ["max-performance-safe"] }
 gix-features = { version = "0.29.0", optional = true }
@ -67,10 +67,10 @@ pest_derive = "2.6.0"
 quick-xml = "0.28.2"
 rand = "0.8.5"
 rayon = "1.7.0"
-regex = "1.8.1"
+regex = { version = "1.8.1", default-features = false, features = ["perf", "std", "unicode-perl"] }
 rust-ini = "0.19.0"
 semver = "1.0.17"
-serde = { version = "1.0.162", features = ["derive"] }
+serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 sha1 = "0.10.5"
 shadow-rs = { version = "0.21.0", default-features = false }
--- a/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml
+++ b/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml
@ -14,7 +14,7 @@ symbol = " "
 symbol = " "

 [directory]
-read_only = " "
+read_only = " 󰌾"

 [docker_context]
 symbol = " "
@ -59,13 +59,13 @@ symbol = " "
 symbol = " "

 [memory_usage]
-symbol = " "
+symbol = "󰍛 "

 [meson]
-symbol = "喝 "
+symbol = "󰔷 "

 [nim]
-symbol = " "
+symbol = "󰆥 "

 [nix_shell]
 symbol = " "
@ -87,10 +87,10 @@ Emscripten = " "
 EndeavourOS = " "
 Fedora = " "
 FreeBSD = " "
-Garuda = "﯑ "
+Garuda = "󰛓 "
 Gentoo = " "
-HardenedBSD = "ﲊ "
-Illumos = " "
+HardenedBSD = "󰞌 "
+Illumos = "󰈸 "
 Linux = " "
 Mabox = " "
 Macos = " "
@ -100,22 +100,22 @@ MidnightBSD = " "
 Mint = " "
 NetBSD = " "
 NixOS = " "
-OpenBSD = " "
+OpenBSD = "󰈺 "
 openSUSE = " "
-OracleLinux = " "
+OracleLinux = "󰌷 "
 Pop = " "
 Raspbian = " "
 Redhat = " "
 RedHatEnterprise = " "
-Redox = " "
-Solus = "ﴱ "
+Redox = "󰀘 "
+Solus = "󰠳 "
 SUSE = " "
 Ubuntu = " "
 Unknown = " "
-Windows = " "
+Windows = "󰍲 "

 [package]
-symbol = " "
+symbol = "󰏗 "

 [pijul_channel]
 symbol = "🪺 "
@ -124,7 +124,7 @@ symbol = "🪺 "
 symbol = " "

 [rlang]
-symbol = "ﳒ "
+symbol = "󰟔 "

 [ruby]
 symbol = " "
--- a/docs/.vuepress/public/presets/toml/pastel-powerline.toml
+++ b/docs/.vuepress/public/presets/toml/pastel-powerline.toml
@ -54,15 +54,15 @@ truncation_symbol = "…/"
 # Here is how you can shorten some long paths by text replacement
 # similar to mapped_locations in Oh My Posh:
 [directory.substitutions]
-"Documents" = " "
+"Documents" = "󰈙 "
 "Downloads" = " "
 "Music" = " "
 "Pictures" = " "
 # Keep in mind that the order matters. For example:
-# "Important Documents" = "  "
+# "Important Documents" = " 󰈙 "
 # will not be replaced, because "Documents" was already substituted before.
 # So either put "Important Documents" before "Documents" or use the substituted version:
-# "Important  " = "  "
+# "Important 󰈙 " = " 󰈙 "

 [c]
 symbol = " "
@ -123,7 +123,7 @@ style = "bg:#86BBD8"
 format = '[ $symbol ($version) ]($style)'

 [nim]
-symbol = " "
+symbol = "󰆥 "
 style = "bg:#86BBD8"
 format = '[ $symbol ($version) ]($style)'

--- a/docs/.vuepress/public/presets/toml/tokyo-night.toml
+++ b/docs/.vuepress/public/presets/toml/tokyo-night.toml
@ -23,7 +23,7 @@ truncation_length = 3
 truncation_symbol = "…/"

 [directory.substitutions]
-"Documents" = " "
+"Documents" = "󰈙 "
 "Downloads" = " "
 "Music" = " "
 "Pictures" = " "
@ -48,7 +48,7 @@ style = "bg:#212736"
 format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'

 [golang]
-symbol = "ﳑ"
+symbol = ""
 style = "bg:#212736"
 format = '[[ $symbol ($version) ](fg:#769ff0 bg:#212736)]($style)'

--- a/docs/config/README.md
+++ b/docs/config/README.md
@ -452,7 +452,7 @@ The `azure` module shows the current Azure Subscription. This is based on showin
 | Variable               | Default                                  | Description                                                                           |
 | ---------------------- | ---------------------------------------- | ------------------------------------------------------------------------------------- |
 | `format`               | `'on [$symbol($subscription)]($style) '` | The format for the Azure module to render.                                            |
-| `symbol`               | `'ﴃ '`                                   | The symbol used in the format.                                                        |
+| `symbol`               | `'󰠅 '`                                   | The symbol used in the format.                                                        |
 | `style`                | `'blue bold'`                            | The style used in the format.                                                         |
 | `disabled`             | `true`                                   | Disables the `azure` module.                                                          |
 | `subscription_aliases` | `{}`                                     | Table of subscription name aliases to display in addition to Azure subscription name. |
@ -467,7 +467,7 @@ The `azure` module shows the current Azure Subscription. This is based on showin
 [azure]
 disabled = false
 format = 'on [$symbol($subscription)]($style) '
-symbol = 'ﴃ '
+symbol = '󰠅 '
 style = 'blue bold'
 ```

@ -479,7 +479,7 @@ style = 'blue bold'
 [azure]
 disabled = false
 format = "on [$symbol($username)]($style) "
-symbol = "ﴃ "
+symbol = "󰠅 "
 style = "blue bold"
 ```

@ -501,11 +501,11 @@ The module is only visible when the device's battery is below 10%.

 | Option               | Default                           | Description                                         |
 | -------------------- | --------------------------------- | --------------------------------------------------- |
-| `full_symbol`        | `' '`                            | The symbol shown when the battery is full.          |
-| `charging_symbol`    | `' '`                            | The symbol shown when the battery is charging.      |
-| `discharging_symbol` | `' '`                            | The symbol shown when the battery is discharging.   |
-| `unknown_symbol`     | `' '`                            | The symbol shown when the battery state is unknown. |
-| `empty_symbol`       | `' '`                            | The symbol shown when the battery state is empty.   |
+| `full_symbol`        | `'󰁹 '`                            | The symbol shown when the battery is full.          |
+| `charging_symbol`    | `'󰂄 '`                            | The symbol shown when the battery is charging.      |
+| `discharging_symbol` | `'󰂃 '`                            | The symbol shown when the battery is discharging.   |
+| `unknown_symbol`     | `'󰁽 '`                            | The symbol shown when the battery state is unknown. |
+| `empty_symbol`       | `'󰂎 '`                            | The symbol shown when the battery state is empty.   |
 | `format`             | `'[$symbol$percentage]($style) '` | The format for the module.                          |
 | `display`            | [link](#battery-display)          | Display threshold and style for the module.         |
 | `disabled`           | `false`                           | Disables the `battery` module.                      |
@ -3746,7 +3746,7 @@ To enable it, set `disabled` to `false` in your configuration file.
 # ~/.config/starship.toml

 [shell]
-fish_indicator = ''
+fish_indicator = '󰈺 '
 powershell_indicator = '_'
 unknown_indicator = 'mystery shell'
 style = 'cyan bold'
--- a/src/configs/azure.rs
+++ b/src/configs/azure.rs
@ -20,7 +20,7 @@ impl<'a> Default for AzureConfig<'a> {
    fn default() -> Self {
        AzureConfig {
            format: "on [$symbol($subscription)]($style) ",
-            symbol: "ﴃ ",
+            symbol: "󰠅 ",
            style: "blue bold",
            disabled: true,
            subscription_aliases: HashMap::new(),
--- a/src/configs/battery.rs
+++ b/src/configs/battery.rs
@ -22,11 +22,11 @@ pub struct BatteryConfig<'a> {
 impl<'a> Default for BatteryConfig<'a> {
    fn default() -> Self {
        BatteryConfig {
-            full_symbol: " ",
-            charging_symbol: " ",
-            discharging_symbol: " ",
-            unknown_symbol: " ",
-            empty_symbol: " ",
+            full_symbol: "󰁹 ",
+            charging_symbol: "󰂄 ",
+            discharging_symbol: "󰂃 ",
+            unknown_symbol: "󰁽 ",
+            empty_symbol: "󰂎 ",
            format: "[$symbol$percentage]($style) ",
            display: vec![BatteryDisplayConfig::default()],
            disabled: false,
--- a/src/modules/azure.rs
+++ b/src/modules/azure.rs
@ -196,7 +196,7 @@ mod tests {
            .collect();
        let expected = Some(format!(
            "on {} ",
-            Color::Blue.bold().paint("ﴃ Subscription 1")
+            Color::Blue.bold().paint("󰠅 Subscription 1")
        ));
        assert_eq!(actual, expected);
        dir.close()
@ -267,7 +267,7 @@ mod tests {
            .collect();
        let expected = Some(format!(
            "on {}",
-            Color::Blue.bold().paint("ﴃ user@domain.com")
+            Color::Blue.bold().paint("󰠅 user@domain.com")
        ));
        assert_eq!(actual, expected);
        dir.close()
@ -338,7 +338,7 @@ mod tests {
            .collect();
        let expected = Some(format!(
            "on {}",
-            Color::Blue.bold().paint("ﴃ :user@domain.com")
+            Color::Blue.bold().paint("󰠅 :user@domain.com")
        ));
        assert_eq!(actual, expected);
        dir.close()
@ -409,7 +409,7 @@ mod tests {
            .collect();
        let expected = Some(format!(
            "on {}",
-            Color::Blue.bold().paint("ﴃ Subscription 1:")
+            Color::Blue.bold().paint("󰠅 Subscription 1:")
        ));
        assert_eq!(actual, expected);
        dir.close()
@ -614,7 +614,7 @@ mod tests {
            .collect();
        let expected = Some(format!(
            "on {}",
-            Color::Blue.bold().paint("ﴃ Subscription 1:user@domain.com")
+            Color::Blue.bold().paint("󰠅 Subscription 1:user@domain.com")
        ));
        assert_eq!(actual, expected);
        dir.close()
@ -689,7 +689,7 @@ mod tests {
            .collect();
        let expected = Some(format!(
            "on {}",
-            Color::Blue.bold().paint("ﴃ tllsn:user@domain.com")
+            Color::Blue.bold().paint("󰠅 tllsn:user@domain.com")
        ));
        assert_eq!(actual, expected);
        dir.close()
--- a/src/modules/battery.rs
+++ b/src/modules/battery.rs
@ -234,7 +234,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(String::from(" 100% "));
+        let expected = Some(String::from("󰁹 100% "));

        assert_eq!(expected, actual);
    }
@ -259,7 +259,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(String::from(" 80% "));
+        let expected = Some(String::from("󰂄 80% "));

        assert_eq!(expected, actual);
    }
@ -284,7 +284,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(String::from(" 80% "));
+        let expected = Some(String::from("󰂃 80% "));

        assert_eq!(expected, actual);
    }
@ -309,7 +309,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(String::from(" 0% "));
+        let expected = Some(String::from("󰁽 0% "));

        assert_eq!(expected, actual);
    }
@ -334,7 +334,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(String::from(" 0% "));
+        let expected = Some(String::from("󰂎 0% "));

        assert_eq!(expected, actual);
    }
@ -384,7 +384,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(format!("{} ", Color::Red.bold().paint(" 40%")));
+        let expected = Some(format!("{} ", Color::Red.bold().paint("󰂃 40%")));

        assert_eq!(expected, actual);
    }
@ -409,7 +409,7 @@ mod tests {
            })
            .battery_info_provider(&mock)
            .collect();
-        let expected = Some(String::from(" 13% "));
+        let expected = Some(String::from("󰂃 13% "));

        assert_eq!(expected, actual);
    }
--- a/src/modules/os.rs
+++ b/src/modules/os.rs
@ -189,10 +189,10 @@ mod tests {
            EndeavourOS = " "
            Fedora = " "
            FreeBSD = " "
-            Garuda = "﯑ "
+            Garuda = "󰛓 "
            Gentoo = " "
-            HardenedBSD = "ﲊ "
-            Illumos = " "
+            HardenedBSD = "󰞌 "
+            Illumos = "󰈸 "
            Linux = " "
            Macos = " "
            Manjaro = " "
@ -201,19 +201,19 @@ mod tests {
            Mint = " "
            NetBSD = " "
            NixOS = " "
-            OpenBSD = " "
+            OpenBSD = "󰈺 "
            SUSE = " "
-            OracleLinux = " "
+            OracleLinux = "󰌷 "
            Pop = " "
            Raspbian = " "
            Redhat = " "
            RedHatEnterprise = " "
-            Redox = " "
-            Solus = "ﴱ "
+            Redox = "󰀘 "
+            Solus = "󰠳 "
            openSUSE = " "
            Ubuntu = " "
            Unknown = " "
-            Windows = " "
+            Windows = "󰍲 "
        };

        let config = OSConfig::load(&config_toml);
@ -230,10 +230,10 @@ mod tests {
            (Type::EndeavourOS, Some(" ")),
            (Type::Fedora, Some(" ")),
            (Type::FreeBSD, Some(" ")),
-            (Type::Garuda, Some("﯑ ")),
+            (Type::Garuda, Some("󰛓 ")),
            (Type::Gentoo, Some(" ")),
-            (Type::HardenedBSD, Some("ﲊ ")),
-            (Type::Illumos, Some(" ")),
+            (Type::HardenedBSD, Some("󰞌 ")),
+            (Type::Illumos, Some("󰈸 ")),
            (Type::Linux, Some(" ")),
            (Type::Macos, Some(" ")),
            (Type::Manjaro, Some(" ")),
@ -242,19 +242,19 @@ mod tests {
            (Type::Mint, Some(" ")),
            (Type::NetBSD, Some(" ")),
            (Type::NixOS, Some(" ")),
-            (Type::OpenBSD, Some(" ")),
+            (Type::OpenBSD, Some("󰈺 ")),
            (Type::SUSE, Some(" ")),
-            (Type::OracleLinux, Some(" ")),
+            (Type::OracleLinux, Some("󰌷 ")),
            (Type::Pop, Some(" ")),
            (Type::Raspbian, Some(" ")),
            (Type::Redhat, Some(" ")),
            (Type::RedHatEnterprise, Some(" ")),
-            (Type::Redox, Some(" ")),
-            (Type::Solus, Some("ﴱ ")),
+            (Type::Redox, Some("󰀘 ")),
+            (Type::Solus, Some("󰠳 ")),
            (Type::openSUSE, Some(" ")),
            (Type::Ubuntu, Some(" ")),
            (Type::Unknown, Some(" ")),
-            (Type::Windows, Some(" ")),
+            (Type::Windows, Some("󰍲 ")),
        ];

        for (t, e) in type_expected_pairs {