Cargo clippy + fmt

crystal-linux · Sep 8, 2022 · aff07d1 · aff07d1
1 parent 7fc11e4
commit aff07d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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),