chore: updated Cargo.lock

chore: bump version to v1.5.0
refactor: various changes using clippy
2024-10-29 21:24:16 +00:00 · 2024-10-29 21:23:09 +00:00 · 2024-10-29 21:12:41 +00:00 · 2024-10-29 19:44:36 +00:00 · 2024-10-29 19:40:46 +00:00 · 2024-10-29 18:47:51 +00:00
5 changed files with 178 additions and 84 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -1,12 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338"
 dependencies = [
 "anstyle",
 "anstyle-parse",
@ -19,33 +19,33 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56"

 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
 "utf8parse",
 ]

 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
 "windows-sys",
 ]

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
 "anstyle",
 "windows-sys",
@ -53,9 +53,9 @@ dependencies = [

 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"

 [[package]]
 name = "bumpalo"
@ -65,7 +65,7 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

 [[package]]
 name = "bunbun"
-version = "1.4.0"
+version = "1.5.0"
 dependencies = [
 "clap",
 "owo-colors",
@ -81,9 +81,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -91,9 +91,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
 "anstream",
 "anstyle",
@ -103,9 +103,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
 "heck",
 "proc-macro2",
@ -121,9 +121,9 @@ checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"

 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"

 [[package]]
 name = "core-foundation-sys"
@ -176,18 +176,18 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"

 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
 "wasm-bindgen",
 ]

 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"

 [[package]]
 name = "log"
@ -195,6 +195,12 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@ -206,30 +212,30 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"

 [[package]]
 name = "owo-colors"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
+checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"

 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
 "proc-macro2",
 ]
@ -256,9 +262,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
 "bitflags",
 ]
@ -271,9 +277,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"

 [[package]]
 name = "syn"
-version = "2.0.75"
+version = "2.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
 dependencies = [
 "proc-macro2",
 "quote",
@ -282,24 +288,23 @@ dependencies = [

 [[package]]
 name = "sysinfo"
-version = "0.30.13"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
+checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791"
 dependencies = [
- "cfg-if",
 "core-foundation-sys",
 "libc",
+ "memchr",
 "ntapi",
- "once_cell",
 "rayon",
 "windows",
 ]

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"

 [[package]]
 name = "utf8parse"
@ -315,9 +320,9 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
 "cfg-if",
 "once_cell",
@ -326,9 +331,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
 "bumpalo",
 "log",
@ -341,9 +346,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@ -351,9 +356,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
 "proc-macro2",
 "quote",
@ -364,15 +369,15 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"

 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@ -380,9 +385,9 @@ dependencies = [

 [[package]]
 name = "whoami"
-version = "1.5.1"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
 "redox_syscall",
 "wasite",
@ -413,9 +418,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 dependencies = [
 "windows-core",
 "windows-targets",
@ -423,18 +428,52 @@ dependencies = [

 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
 "windows-targets",
 ]

 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
 "windows-targets",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -2,17 +2,17 @@
 name = "bunbun"
 description = "A simple and adorable sysinfo utility."
 authors = ["Muhammad Nauman Raza <devraza@skiff.com>"]
-version = "1.4.0"
+version = "1.5.0"
 edition = "2021"
 categories = ["command-line-utilities"]
 license-file = "LICENSE"
 readme = "README.md"

 [dependencies]
-clap = { version = "4.5.9", features = ["derive"] }
-owo-colors = "4.0.0"
-sysinfo = "0.30.13"
-whoami = "1.5.1"
+clap = { version = "4.5.20", features = ["derive"] }
+owo-colors = "4.1.0"
+sysinfo = "0.32.0"
+whoami = "1.5.2"

 [profile.release]
 strip = true # Strip debug symbols
--- a/README.md
+++ b/README.md
@ -21,7 +21,7 @@ $ cargo build --release # `--release` adds a few optimisations
 ```bash
 nix-shell -p bunbun
 ```
-To install it on NixOS or home-manager, add it to `environment.systemPackages` or `home.packages` respectively.
+To install it on NixOS or home-manager, add `bunbun` to `environment.systemPackages` or `home.packages` respectively.

 ## Inspiration
 - [Rosettea/bunnyfetch](https://github.com/Rosettea/bunnyfetch)
--- a/flake.nix
+++ b/flake.nix
@ -14,7 +14,7 @@
      {
        packages.default = pkgs.rustPlatform.buildRustPackage {
            pname = "bunbun";
-            version = "1.4.0";
+            version = "1.5.0";
            src = ./.;
            cargoLock.lockFile = ./Cargo.lock;
          };
--- a/src/main.rs
+++ b/src/main.rs
@ -20,9 +20,17 @@ struct Args {
    #[arg(short = 'k', long)]
    kernel: bool,

+    /// Hide the username and hostname
+    #[arg(short = 'u', long)]
+    hide_combined: bool,
+
    /// Hide terminal colours
    #[arg(short = 'z', long, default_value_t = false)]
    hide_colours: bool,
+
+    /// Use the alternative ASCII art
+    #[arg(short = 'A', long, default_value_t = false)]
+    alt_art: bool,
 }

 // Display the CPU architecture
@ -41,16 +49,29 @@ fn display_kernel(args: &Args) {
    }
 }

-fn main() {
-    let args = Args::parse();
-
-    let bottom = format!("c({})({})", "\"".red(), "\"".red()).to_string();
-    let ascii = ["(\\ /)", "( . .)", &bottom];
-
+// Hide the username@hostname text
+fn hide_combined(args: &Args) {
+    if !args.hide_combined {
        let hostname = fallible::hostname().unwrap_or(String::from("N/A"));
        let user = username();
-
        let combined = format!("{}@{}", user, hostname);
+        println!("{: <13}{}", "", combined.bold());
+    }
+}
+
+// Display the ASCII art
+fn ascii_art(args: &Args) -> [String; 3] {
+    if !args.alt_art {
+        let bottom = format!("c({})({})", "\"".red(), "\"".red()).to_string();
+        ["(\\ /)".to_string(), "( . .)".to_string(), bottom]
+    } else {
+        let top = format!("{}", ".".red()).to_string();
+        [top, "\\\\  /\\".to_string(), " \\\\//V".to_string()]
+    }
+}
+
+fn main() {
+    let args = Args::parse();

    let pretty = distro();

@ -81,14 +102,48 @@ fn main() {

    println!();
    if !args.ascii_only {
-        println!("{: <13}{}", "", combined.bold());
+        hide_combined(&args);
        cpu_arch(&args);
        display_kernel(&args);
-        println!("{:>8} {:>6} {}", ascii[0], "OS".red().bold(), pretty);
-        println!("{:>9} {:>8} {}", ascii[1], "Shell".green().bold(), shell);
-        println!("{:>30} {:>4} {}", ascii[2], "WM".blue().bold(), wm);
+        let ascii = ascii_art(&args);
+
+        let spacings: [usize; 3] = if args.alt_art {
+            [
+                (7 - (ascii[0].len() - 10)) + 2,
+                (7 - ascii[1].len()) + 2,
+                (7 - ascii[2].len()) + 2,
+            ]
        } else {
-        for i in ascii {
+            [
+                (7 - ascii[0].len()) + 2,
+                (7 - ascii[1].len()) + 2,
+                (7 - (ascii[2].len() - 20)) + 2,
+            ]
+        };
+
+        println!(
+            "   {}{} {} {}",
+            ascii[0],
+            " ".to_string().repeat(spacings[0]),
+            "OS".red().bold(),
+            pretty
+        );
+        println!(
+            "   {}{} {} {}",
+            ascii[1],
+            " ".to_string().repeat(spacings[1]),
+            "Shell".green().bold(),
+            shell
+        );
+        println!(
+            "   {}{} {} {}",
+            ascii[2],
+            " ".to_string().repeat(spacings[2]),
+            "WM".blue().bold(),
+            wm
+        );
+    } else {
+        for i in ascii_art(&args) {
            println!("  {}", i);
        }
    }
Author	SHA1	Message	Date
Muhammad Nauman Raza	5e4de7effc	chore: updated Cargo.lock	2024-10-29 21:24:16 +00:00
Muhammad Nauman Raza	bc9c5329da	chore: bump version to v1.5.0	2024-10-29 21:23:09 +00:00
Muhammad Nauman Raza	cf186e625e	refactor: various changes using clippy	2024-10-29 21:12:41 +00:00
Muhammad Nauman Raza	a47a8f819a	chore(aesthetic): use a capital `V` to make the ear more natural	2024-10-29 19:44:36 +00:00
Muhammad Nauman Raza	451df20a7b	feat: alternative ASCII art through the `-A` flag	2024-10-29 19:40:46 +00:00
Muhammad Nauman Raza	e7e8463164	cargo: update	2024-10-29 18:47:51 +00:00
Muhammad Nauman Raza	20271511cd	chore: remove extra empty line	2024-10-29 18:36:30 +00:00
Muhammad Nauman Raza	bf03c3559b	feat: option to hide the username@hostname combination	2024-10-29 18:35:54 +00:00
Muhammad Nauman Raza	996d82a836	cargo: upgrade and update dependencies	2024-10-09 09:20:13 +01:00
Muhammad Nauman Raza	14a3e87461	chore: bump dependencies	2024-09-24 21:28:39 +01:00
Muhammad Nauman Raza	53971f5785	docs: clarification of installation on NixOS	2024-09-24 13:41:48 +01:00