diff --git a/.github/assets/demo.png b/.github/assets/demo.png index 8a40cf7..945e489 100644 Binary files a/.github/assets/demo.png and b/.github/assets/demo.png differ diff --git a/README.md b/README.md index 88d7d39..f27384d 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Nix's binary cache, though._ ## Customizing -You can't\*. +You can't. ### Why? @@ -102,11 +102,6 @@ run `direnv allow` to get started. Non-nix users will need `cargo` and `gcc` installed on their system, see `Cargo.toml` for available release profiles. -## Thanks - -Huge thanks to everyone who took the time to make pull requests or nag me in -person about current issues. - ## License Microfetch is licensed under [GPL3](LICENSE). See the license file for details. diff --git a/src/main.rs b/src/main.rs index aace49d..5cae03a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,20 +9,23 @@ use crate::desktop::get_desktop_info; use crate::release::{get_os_pretty_name, get_system_info}; use crate::system::{get_memory_usage, get_root_disk_usage, get_shell, get_username_and_hostname}; use crate::uptime::get_current; +use std::io; use color_eyre::Report; +use nix::sys::sysinfo::sysinfo; fn main() -> Result<(), Report> { color_eyre::install()?; + let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; let fields = Fields { user_info: get_username_and_hostname(), os_name: get_os_pretty_name()?, kernel_version: get_system_info()?, shell: get_shell(), desktop: get_desktop_info(), - uptime: get_current()?, - memory_usage: get_memory_usage()?, + uptime: get_current(&info)?, + memory_usage: get_memory_usage(&info), storage: get_root_disk_usage()?, colors: print_dots(), }; diff --git a/src/system.rs b/src/system.rs index 964aec1..5fa8587 100644 --- a/src/system.rs +++ b/src/system.rs @@ -1,5 +1,6 @@ use color_eyre::Result; use nix::sys::statvfs::statvfs; +use nix::sys::sysinfo::SysInfo; use std::env; use std::io::{self}; @@ -39,33 +40,21 @@ pub fn get_root_disk_usage() -> Result { )) } -pub fn get_memory_usage() -> Result { +pub fn get_memory_usage(info: &SysInfo) -> String { #[inline(always)] - fn parse_memory_info() -> Result<(f64, f64), io::Error> { - let mut total_memory_kb = 0.0; - let mut available_memory_kb = 0.0; + fn parse_memory_info(info: &SysInfo) -> (f64, f64) { + let total_memory_kb = (info.ram_total() / 1024) as f64; + let available_memory_kb = (info.ram_unused() / 1024) as f64; - for line in std::fs::read_to_string("/proc/meminfo")?.lines() { - let mut split = line.split_whitespace(); - let key = split.next().unwrap_or(""); - if key == "MemTotal:" { - total_memory_kb = split.next().unwrap_or("0").parse().unwrap_or(0.0); - } else if key == "MemAvailable:" { - available_memory_kb = split.next().unwrap_or("0").parse().unwrap_or(0.0); - } - } - - let total_memory_gb = total_memory_kb / 1024.0 / 1024.0; - let available_memory_gb = available_memory_kb / 1024.0 / 1024.0; + let total_memory_gb = total_memory_kb / (1024.0 * 1024.0); + let available_memory_gb = available_memory_kb / (1024.0 * 1024.0); let used_memory_gb = total_memory_gb - available_memory_gb; - Ok((used_memory_gb, total_memory_gb)) + (used_memory_gb, total_memory_gb) } - let (used_memory, total_memory) = parse_memory_info()?; + let (used_memory, total_memory) = parse_memory_info(info); let percentage_used = (used_memory / total_memory * 100.0).round() as u64; - Ok(format!( - "{used_memory:.2} GiB / {total_memory:.2} GiB ({CYAN}{percentage_used}%{RESET})" - )) + format!("{used_memory:.2} GiB / {total_memory:.2} GiB ({CYAN}{percentage_used}%{RESET})") } diff --git a/src/uptime.rs b/src/uptime.rs index 6c44640..4090acd 100644 --- a/src/uptime.rs +++ b/src/uptime.rs @@ -1,9 +1,8 @@ use color_eyre::Result; -use nix::sys::sysinfo::sysinfo; +use nix::sys::sysinfo::SysInfo; use std::io; -pub fn get_current() -> Result { - let info = sysinfo().map_err(|e| io::Error::new(io::ErrorKind::Other, e))?; +pub fn get_current(info: &SysInfo) -> Result { let uptime_seconds = info.uptime().as_secs_f64(); let total_minutes = (uptime_seconds / 60.0).round() as u64;