From ae881c5bacb664c79f5179aa63715dddac457d7c Mon Sep 17 00:00:00 2001 From: axtloss Date: Fri, 5 Aug 2022 18:40:58 +0200 Subject: [PATCH] fmt --- src/args.rs | 1 - src/functions/desktops.rs | 2 +- src/functions/users.rs | 1 - src/internal/config.rs | 2 +- src/internal/install.rs | 2 +- src/main.rs | 8 +++++++- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/args.rs b/src/args.rs index 53f0201..0f42b06 100644 --- a/src/args.rs +++ b/src/args.rs @@ -238,7 +238,6 @@ pub struct NewUserArgs { pub enum DesktopSetup { //#[clap(name = "onyx")] //Onyx, - #[clap(name = "gnome")] Gnome, diff --git a/src/functions/desktops.rs b/src/functions/desktops.rs index a0a073e..cdeb4ed 100755 --- a/src/functions/desktops.rs +++ b/src/functions/desktops.rs @@ -5,7 +5,7 @@ use crate::internal::*; pub fn install_desktop_setup(desktop_setup: DesktopSetup) { log::debug!("Installing {:?}", desktop_setup); match desktop_setup { - // DesktopSetup::Onyx => install_onyx(), + // DesktopSetup::Onyx => install_onyx(), DesktopSetup::Gnome => install_gnome(), DesktopSetup::Kde => install_kde(), DesktopSetup::Budgie => install_budgie(), diff --git a/src/functions/users.rs b/src/functions/users.rs index cf8c325..81502df 100755 --- a/src/functions/users.rs +++ b/src/functions/users.rs @@ -95,4 +95,3 @@ pub fn root_pass(root_pass: &str) { "set root password", ); } - diff --git a/src/internal/config.rs b/src/internal/config.rs index d3ddbd1..e413133 100755 --- a/src/internal/config.rs +++ b/src/internal/config.rs @@ -158,7 +158,7 @@ pub fn read_config(configpath: PathBuf) { desktops::install_desktop_setup(*desktop); }*/ match config.desktop.as_str() { - // "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx), + // "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx), "plasma" => desktops::install_desktop_setup(DesktopSetup::Kde), "mate" => desktops::install_desktop_setup(DesktopSetup::Mate), "gnome" => desktops::install_desktop_setup(DesktopSetup::Gnome), diff --git a/src/internal/install.rs b/src/internal/install.rs index b803c4f..a136fac 100755 --- a/src/internal/install.rs +++ b/src/internal/install.rs @@ -1,5 +1,5 @@ -use crate::internal::*; use crate::functions::partition::umount; +use crate::internal::*; use std::process::Command; pub fn install(pkgs: Vec<&str>) { diff --git a/src/main.rs b/src/main.rs index c3d924a..3925e73 100755 --- a/src/main.rs +++ b/src/main.rs @@ -53,7 +53,13 @@ fn main() { } Command::Users { subcommand } => match subcommand { UsersSubcommand::NewUser(args) => { - users::new_user(&args.username, args.hasroot, &args.password, true, &args.shell); + users::new_user( + &args.username, + args.hasroot, + &args.password, + true, + &args.shell, + ); } UsersSubcommand::RootPass { password } => { users::root_pass(&password);