diff --git a/.github/config-schema.json b/.github/config-schema.json index cf0ced4f..6272d23b 100644 --- a/.github/config-schema.json +++ b/.github/config-schema.json @@ -1121,10 +1121,12 @@ "format": "[$symbol]($style)", "style": "bold white", "symbols": { + "Alpaquita": "🔔 ", "Alpine": "đŸ”ïž ", "Amazon": "🙂 ", "Android": "đŸ€– ", "Arch": "đŸŽ—ïž ", + "Artix": "đŸŽ—ïž ", "CentOS": "💠 ", "Debian": "🌀 ", "DragonFly": "🐉 ", @@ -1137,6 +1139,7 @@ "HardenedBSD": "đŸ›Ąïž ", "Illumos": "🐩 ", "Linux": "🐧 ", + "Mabox": "📩 ", "Macos": "🍎 ", "Manjaro": "đŸ„­ ", "Mariner": "🌊 ", @@ -4377,10 +4380,12 @@ }, "symbols": { "default": { + "Alpaquita": "🔔 ", "Alpine": "đŸ”ïž ", "Amazon": "🙂 ", "Android": "đŸ€– ", "Arch": "đŸŽ—ïž ", + "Artix": "đŸŽ—ïž ", "CentOS": "💠 ", "Debian": "🌀 ", "DragonFly": "🐉 ", @@ -4393,6 +4398,7 @@ "HardenedBSD": "đŸ›Ąïž ", "Illumos": "🐩 ", "Linux": "🐧 ", + "Mabox": "📩 ", "Macos": "🍎 ", "Manjaro": "đŸ„­ ", "Mariner": "🌊 ", diff --git a/Cargo.lock b/Cargo.lock index 9578ff4e..6b7616db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2012,9 +2012,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", diff --git a/Cargo.toml b/Cargo.toml index 27edc1a4..4612c903 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,7 +60,7 @@ nu-ansi-term = "0.47.0" once_cell = "1.17.1" open = "4.0.1" # update os module config and tests when upgrading os_info -os_info = "3.6.0" +os_info = "3.7.0" path-slash = "0.2.1" pest = "2.5.7" pest_derive = "2.5.7" diff --git a/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml b/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml index c39a06f6..71897d12 100644 --- a/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml +++ b/docs/.vuepress/public/presets/toml/nerd-font-symbols.toml @@ -74,10 +74,12 @@ symbol = " " symbol = " " [os.symbols] +Alpaquita = "îȘą " Alpine = " " Amazon = " " Android = " " Arch = " " +Artix = " " CentOS = " " Debian = " " DragonFly = " " @@ -90,6 +92,7 @@ Gentoo = " " HardenedBSD = "ïȊ " Illumos = " " Linux = " " +Mabox = " " Macos = " " Manjaro = " " Mariner = " " diff --git a/docs/.vuepress/public/presets/toml/plain-text-symbols.toml b/docs/.vuepress/public/presets/toml/plain-text-symbols.toml index 83b23e66..1bbc1d89 100644 --- a/docs/.vuepress/public/presets/toml/plain-text-symbols.toml +++ b/docs/.vuepress/public/presets/toml/plain-text-symbols.toml @@ -119,10 +119,12 @@ symbol = "ml " symbol = "opa " [os.symbols] +Alpaquita = "alq " Alpine = "alp " Amazon = "amz " Android = "andr " Arch = "rch " +Artix = "atx " CentOS = "cent " Debian = "deb " DragonFly = "dfbsd " @@ -135,6 +137,7 @@ Gentoo = "gent " HardenedBSD = "hbsd " Illumos = "lum " Linux = "lnx " +Mabox = "mbox " Macos = "mac " Manjaro = "mjo " Mariner = "mrn " diff --git a/docs/config/README.md b/docs/config/README.md index 32d3d3af..8ce553d9 100644 --- a/docs/config/README.md +++ b/docs/config/README.md @@ -3004,10 +3004,12 @@ If you would like an operating system to be added, feel free to open a [feature ```toml # This is the default symbols table. [os.symbols] +Alpaquita = "🔔 " Alpine = "đŸ”ïž " Amazon = "🙂 " Android = "đŸ€– " Arch = "đŸŽ—ïž " +Artix = "đŸŽ—ïž " CentOS = "💠 " Debian = "🌀 " DragonFly = "🐉 " @@ -3020,6 +3022,7 @@ Gentoo = "đŸ—œïž " HardenedBSD = "đŸ›Ąïž " Illumos = "🐩 " Linux = "🐧 " +Mabox = "📩 " Macos = "🍎 " Manjaro = "đŸ„­ " Mariner = "🌊 " diff --git a/src/configs/os.rs b/src/configs/os.rs index 0095ccf5..84a5e0e4 100644 --- a/src/configs/os.rs +++ b/src/configs/os.rs @@ -28,10 +28,12 @@ impl<'a> Default for OSConfig<'a> { format: "[$symbol]($style)", style: "bold white", symbols: indexmap! { + Type::Alpaquita => "🔔 ", Type::Alpine => "đŸ”ïž ", Type::Amazon => "🙂 ", Type::Android => "đŸ€– ", Type::Arch => "đŸŽ—ïž ", + Type::Artix => "đŸŽ—ïž ", Type::CentOS => "💠 ", Type::Debian => "🌀 ", Type::DragonFly => "🐉 ", @@ -44,6 +46,7 @@ impl<'a> Default for OSConfig<'a> { Type::HardenedBSD => "đŸ›Ąïž ", Type::Illumos => "🐩 ", Type::Linux => "🐧 ", + Type::Mabox => "📩 ", Type::Macos => "🍎 ", Type::Manjaro => "đŸ„­ ", Type::Mariner => "🌊 ", diff --git a/src/modules/os.rs b/src/modules/os.rs index 74fd1121..28d1dc07 100644 --- a/src/modules/os.rs +++ b/src/modules/os.rs @@ -331,10 +331,11 @@ mod tests { // - dosc/.vuepress/public/presets/toml/nerd-font-symbols.toml // - .github/config-schema.json let _ = |t: Type| match t { + Type::Alpaquita => "🔔 ", Type::Alpine => "đŸ”ïž ", Type::Amazon => "🙂 ", Type::Android => "đŸ€– ", - Type::Arch => "đŸŽ—ïž ", + Type::Arch | Type::Artix => "đŸŽ—ïž ", Type::CentOS => "💠 ", Type::Debian => "🌀 ", Type::DragonFly => "🐉 ", @@ -347,6 +348,7 @@ mod tests { Type::HardenedBSD => "đŸ›Ąïž ", Type::Illumos => "🐩 ", Type::Linux => "🐧 ", + Type::Mabox => "📩 ", Type::Macos => "🍎 ", Type::Manjaro => "đŸ„­ ", Type::Mariner => "🌊 ",