From aff07d1d87b6c855c97c4dc71789377b5506a433 Mon Sep 17 00:00:00 2001
From: axtloss <axtlos@tar.black>
Date: Thu, 8 Sep 2022 23:53:15 +0200
Subject: [PATCH] Cargo clippy + fmt

---
 src/args.rs               |  5 +++--
 src/functions/desktops.rs | 14 ++------------
 src/internal/config.rs    |  3 ++-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/args.rs b/src/args.rs
index bbad379..6340e35 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -240,8 +240,9 @@ pub struct NewUserArgs {
 
 #[derive(Debug, ArgEnum, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Serialize, Deserialize)]
 pub enum DesktopSetup {
-    //#[clap(name = "onyx")]
-    //Onyx,
+    #[clap(name = "onyx")]
+    Onyx,
+
     #[clap(name = "gnome")]
     Gnome,
 
diff --git a/src/functions/desktops.rs b/src/functions/desktops.rs
index 54d4690..5db875c 100755
--- a/src/functions/desktops.rs
+++ b/src/functions/desktops.rs
@@ -276,22 +276,12 @@ fn install_kde() {
 }
 
 fn install_gnome() {
-    install(vec![
-        "xorg",
-        "gnome",
-        "sushi",
-        "gdm"
-    ]);
+    install(vec!["xorg", "gnome", "sushi", "gdm"]);
     enable_dm("gdm");
 }
 
 fn install_onyx() {
-    install(vec![
-        "xorg",
-        "onyx",
-        "sushi",
-        "gdm"
-    ]);
+    install(vec!["xorg", "onyx", "sushi", "gdm"]);
     enable_dm("gdm");
 }
 
diff --git a/src/internal/config.rs b/src/internal/config.rs
index ed145c5..deb8c7a 100755
--- a/src/internal/config.rs
+++ b/src/internal/config.rs
@@ -165,8 +165,9 @@ pub fn read_config(configpath: PathBuf) {
         desktops::install_desktop_setup(*desktop);
     }*/
     match config.desktop.to_lowercase().as_str() {
-        // "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx),
+        "onyx" => desktops::install_desktop_setup(DesktopSetup::Onyx),
         "kde" => desktops::install_desktop_setup(DesktopSetup::Kde),
+        "plasma" => desktops::install_desktop_setup(DesktopSetup::Kde),
         "mate" => desktops::install_desktop_setup(DesktopSetup::Mate),
         "gnome" => desktops::install_desktop_setup(DesktopSetup::Gnome),
         "cinnamon" => desktops::install_desktop_setup(DesktopSetup::Cinnamon),