chore: cleanup

src/args.rs

@@ -1,7 +1,6 @@
 use crate::shell::{initialization, Init};
 use colored::Colorize;
 
-
 pub enum Status {
 	Continue,
 	Exit, // version, help, etc.

src/shell.rs

@@ -226,7 +226,7 @@ pub fn command_output(shell: &str, command: &str) -> String {
 		.output()
 		.expect("failed to execute process");
 
-		String::from_utf8_lossy(&output.stdout).to_string()
+	String::from_utf8_lossy(&output.stdout).to_string()
 }
 
 pub fn last_command(shell: &str) -> String {

src/system.rs

@@ -1,15 +1,11 @@
-use crate::shell::{Data, command_output, elevate};
+use crate::shell::{command_output, elevate, Data};
 use std::io::stderr;
 use std::process::Command;
 use std::process::Stdio;
 
 pub fn get_package_manager(data: &mut Data) -> Option<String> {
 	let package_managers = vec![
-		"apt",
+		"apt", "dnf", "emerge", "nix", "pacman",
-		"dnf",
-		"emerge",
-		"nix",
-		"pacman",
 		// "pkg",
 		// "yum",
 		// "zypper",
@@ -23,7 +19,11 @@ pub fn get_package_manager(data: &mut Data) -> Option<String> {
 	None
 }
 
-pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) -> Option<Vec<String>> {
+pub fn get_packages(
+	data: &mut Data,
+	package_manager: &str,
+	executable: &str,
+) -> Option<Vec<String>> {
 	let shell = &data.shell.clone();
 	match package_manager {
 		"apt" => {
@@ -32,7 +32,7 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
 			}
 			let result = command_output(shell, &format!("dpkg -S '*/bin/{}'", executable));
 			if result.is_empty() {
-				return None
+				return None;
 			}
 			let packages: Vec<String> = result
 				.lines()
@@ -44,11 +44,11 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
 			} else {
 				Some(packages)
 			}
-		},
+		}
 		"dnf" => {
 			let result = command_output(shell, &format!("dnf provides {}", executable));
 			if result.is_empty() {
-				return None
+				return None;
 			}
 			let packages: Vec<String> = result
 				.lines()
@@ -59,14 +59,14 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
 			} else {
 				Some(packages)
 			}
-		},
+		}
 		"emerge" => {
 			if !data.has_executable("e-file") {
 				return None;
 			}
 			let result = command_output(shell, &format!("e-file /usr/bin/{}", executable));
 			if result.is_empty() {
-				return None
+				return None;
 			}
 			let mut packages = vec![];
 			for line in result.lines() {
@@ -79,22 +79,26 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
 			} else {
 				Some(packages)
 			}
-		},
+		}
 		"nix" => {
 			if !data.has_executable("nix-locate") {
 				return None;
 			}
 			let result = command_output(shell, &format!("nix-locate 'bin/{}'", executable));
 			if result.is_empty() {
-				return None
+				return None;
 			}
 			let packages: Vec<String> = result
 				.lines()
-				.map(|line| line
+				.map(|line| {
-					.split_whitespace()
+					line.split_whitespace()
-					.next().unwrap()
+						.next()
-					.rsplit_once('.')
+						.unwrap()
-					.unwrap().0.to_string())
+						.rsplit_once('.')
+						.unwrap()
+						.0
+						.to_string()
+				})
 				.collect();
 			if packages.is_empty() {
 				None
@@ -105,11 +109,11 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
 		"pacman" => {
 			let result = if data.has_executable("pkgfile") {
 				command_output(shell, &format!("pkgfile -b {}", executable))
-			} else{
+			} else {
 				command_output(shell, &format!("pacman -Fq /usr/bin/{}", executable))
 			};
 			if result.is_empty() {
-				return None
+				return None;
 			}
 			let packages: Vec<String> = result
 				.lines()
@@ -120,7 +124,7 @@ pub fn get_packages(data: &mut Data, package_manager: &str, executable: &str) ->
 			} else {
 				Some(packages)
 			}
-		},
+		}
 		_ => unreachable!("Unsupported package manager"),
 	}
 }