fix: fix os and host detection on Windows

src/lib.rs

@@ -341,13 +341,12 @@ pub fn host(general_readout: &GeneralReadout) -> Option<String> {
                 Some(final_str)
             }
         }
-        "macos" => match general_readout.machine() {
+        _ => match general_readout.machine() {
+            Ok(host) => Some(host),
+            Err(_) => match general_readout.cpu_model_name() {
                 Ok(host) => Some(host),
                 Err(_) => None,
             },
-        _ => match general_readout.cpu_model_name() {
-            Ok(host) => Some(host),
-            Err(_) => None,
         },
     }
 }

src/main.rs

@@ -251,7 +251,7 @@ fn main() {
         kernel_readout: KernelReadout::new(),
     };
 
-    let os = get_info(&PfetchInfo::Os, &readouts, skip_slow_package_managers).unwrap_or_default();
+    let os = pfetch::os(&GeneralReadout::new()).unwrap_or_default();
 
     let logo_override = env::var("PF_ASCII");
 
@@ -277,12 +277,13 @@ fn main() {
 
     let gathered_pfetch_info: Vec<(pfetch::Color, String, String)> = enabled_pf_info
         .iter()
-        .filter_map(|info| {
+        .filter_map(|info| match info {
+            PfetchInfo::Os => Some((logo.primary_color, info.to_string(), os.clone())),
+            _ => {
                 let info_result = get_info(info, &readouts, skip_slow_package_managers);
                 match info_result {
                     Some(info_str) => match info {
                         PfetchInfo::Title => Some((logo.secondary_color, info_str, "".to_string())),
-                    PfetchInfo::Os => Some((logo.primary_color, info.to_string(), os.to_owned())),
                         PfetchInfo::BlankLine => {
                             Some((logo.primary_color, "".to_string(), "".to_string()))
                         }
@@ -291,6 +292,7 @@ fn main() {
                     },
                     None => None,
                 }
+            }
         })
         .collect();