diff --git a/src/lib.rs b/src/lib.rs index 6385d48..bcf8e11 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -73,7 +73,7 @@ pub enum PackageManager { /// Obtain the amount of installed packages on the system by checking all installed supported package /// managers and adding the amounts -pub fn total_packages(package_readout: &PackageReadout, skip_slow_package_managers: bool) -> usize { +pub fn total_packages(package_readout: &PackageReadout, skip_slow: bool) -> usize { match env::consts::OS { "linux" => { let macchina_package_count: Vec<(String, usize)> = package_readout @@ -97,7 +97,7 @@ pub fn total_packages(package_readout: &PackageReadout, skip_slow_package_manage PackageManager::Nix, ] .iter() - .map(|mngr| packages(mngr, &macchina_package_count, skip_slow_package_managers)) + .map(|mngr| packages(mngr, &macchina_package_count, skip_slow)) .sum() } "macos" => package_readout @@ -130,7 +130,7 @@ fn get_macchina_package_count( /// return the amount of packages installed with a given linux package manager /// Return `0` if the package manager is not installed -fn packages(pkg_manager: &PackageManager, macchina_package_count: &[(String, usize)], skip_slow_package_managers: bool) -> usize { +fn packages(pkg_manager: &PackageManager, macchina_package_count: &[(String, usize)], skip_slow: bool) -> usize { match pkg_manager { // libmacchina has very fast implementations for most package managers, so we use them // where we can, otherwise we fall back to method used by dylans version of pfetch @@ -176,7 +176,7 @@ fn packages(pkg_manager: &PackageManager, macchina_package_count: &[(String, usi } // TODO: nix -q is very slow PackageManager::Nix => { - if check_if_command_exists("nix-store") && !skip_slow_package_managers { + if check_if_command_exists("nix-store") && !skip_slow { run_and_count_lines( "nix-store", &["-q", "--requisites", "/run/current-system/sw"], diff --git a/src/main.rs b/src/main.rs index bdcbf5a..17236c3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -200,7 +200,7 @@ fn main() { dotenvy::from_path(filepath).unwrap(); } // Check if SKIP_SLOW is enabled - let skip_slow = dotenvy::var("PF_FAST_PKG_COUNT").is_ok(); + let skip_slow_package_managers = dotenvy::var("PF_FAST_PKG_COUNT").is_ok(); let enabled_pf_info_base: Vec = match dotenvy::var("PF_INFO") { Ok(pfetch_infos) => pfetch_infos @@ -244,7 +244,7 @@ fn main() { kernel_readout: KernelReadout::new(), }; - let os = get_info(&PfetchInfo::Os, &readouts, skip_slow).unwrap_or_default(); + let os = get_info(&PfetchInfo::Os, &readouts, skip_slow_package_managers).unwrap_or_default(); let logo_override = env::var("PF_ASCII"); @@ -271,7 +271,7 @@ fn main() { let gathered_pfetch_info: Vec<(pfetch::Color, String, String)> = enabled_pf_info .iter() .filter_map(|info| { - let info_result = get_info(info, &readouts, skip_slow); + 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())),