diff --git a/README.md b/README.md index b7f2954..d99fb34 100644 --- a/README.md +++ b/README.md @@ -146,15 +146,6 @@ USER="" # Which hostname to display. HOSTNAME="" -# Which editor to display. -EDITOR="" - -# Which shell to display. -SHELL="" - -# Which desktop environment to display. -XDG_CURRENT_DESKTOP="" - # Skip package managers that take "long" to query package count (like nix) PF_FAST_PKG_COUNT=1 ``` diff --git a/src/lib.rs b/src/lib.rs index 8244e44..57ddf95 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -356,7 +356,10 @@ pub fn shell(general_readout: &GeneralReadout) -> Option { libmacchina::traits::ShellKind::Default, ) { Ok(shell) => Some(shell), - Err(_) => None, + Err(_) => match dotenvy::var("SHELL") { + Ok(shell) => Some(shell), + Err(_) => None, + }, } } @@ -380,7 +383,10 @@ pub fn wm(general_readout: &GeneralReadout) -> Option { pub fn de(general_readout: &GeneralReadout) -> Option { match general_readout.desktop_environment() { Ok(de) => Some(de), - Err(_) => None, + Err(_) => match dotenvy::var("XDG_CURRENT_DESKTOP") { + Ok(de) => Some(de), + Err(_) => None, + }, } } diff --git a/src/main.rs b/src/main.rs index 14c1d15..289304e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -183,19 +183,10 @@ fn get_info( .to_string(), ), PfetchInfo::Memory => pfetch::memory(&readouts.memory_readout), - PfetchInfo::Shell => match dotenvy::var("SHELL") { - Ok(shell) => Some(shell), - Err(_) => pfetch::shell(&readouts.general_readout), - }, - PfetchInfo::Editor => match dotenvy::var("EDITOR") { - Ok(editor) => Some(editor), - Err(_) => pfetch::editor(), - }, + PfetchInfo::Shell => pfetch::shell(&readouts.general_readout), + PfetchInfo::Editor => pfetch::editor(), PfetchInfo::Wm => pfetch::wm(&readouts.general_readout), - PfetchInfo::De => match dotenvy::var("XDG_CURRENT_DESKTOP") { - Ok(de) => Some(de), - Err(_) => pfetch::de(&readouts.general_readout), - }, + PfetchInfo::De => pfetch::de(&readouts.general_readout), PfetchInfo::Palette => Some(pfetch::palette()), PfetchInfo::BlankLine => Some("".to_string()), }