Merge pull request #8 from crystal-linux/development

Development

README.md

@@ -68,16 +68,18 @@ jade networking getcryst.al --ipv6
 ### configure users
 ```sh
 # make a new user called nonRootHaver, without sudo and easytohack as the password
-jade users newUser nonRootHaver easytohack
+# jade uses prehashed passwords for user creation, so you'll have to calculate the hash of the password
+jade users newUser nonRootHaver $(openssl passwd -6 easytohack)
 
 # make a user called rootHaver, with sudo and omgsosuperhardtohack as the password
-jade users newUser rootHaver omgsosuperhardtohack --sudoer
+jade users newUser rootHaver $(openssl passwd -6 omgsuperhardtohack) --sudoer
 ```
 
 ### set root password
 ```sh
 # set the root password to 'muchSecurity,veryHardToHack'
-jade users rootPass muchSecurity,veryHardToHack
+# the same hashing thing goes for root passwords
+jade users rootPass $(openssl passwd -1 muchSecurity,veryHardToHack)
 ```
 
 ### install a desktop environment
@@ -94,6 +96,11 @@ jade desktops gnome
 jade setup-timeshift
 ```
 
+### setup flatpak
+```sh
+jade flatpak
+```
+
 ### debug logging
 
 debug messages:

src/args.rs

@@ -225,7 +225,7 @@ pub struct NewUserArgs {
     #[clap(long, aliases=&["has-root", "sudoer", "root"])]
     pub hasroot: bool,
 
-    /// The password to set. NOTE: Takes hashed password, use `openssl passwd -1 <password>` to generate the hash.
+    /// The password to set. NOTE: Takes hashed password, use `openssl passwd -6 <password>` to generate the hash.
     /// When not providing a password openssl jumps into an interactive masked input mode allowing you to hide your password
     /// from the terminal history.
     pub password: String,

src/functions/desktops.rs

@@ -56,6 +56,11 @@ fn install_xfce() {
         "lightdm-gtk-greeter",
         "lightdm-gtk-greeter-settings",
         "xfce4-goodies",
+        "pipewire",
+        "pipewire-pulse",
+        "pipewire-jack",
+        "pipewire-alsa",
+        "pavucontrol",
     ]);
     files_eval(
         files::append_file(
@@ -142,11 +147,14 @@ fn install_kde() {
 
 fn install_gnome() {
     install(vec![
+        "gnome-shell",
+        "nautilus",
+        "gnome-terminal",
+        "gnome-control-center",
+        "xdg-user-dirs",
+        "gdm",
         "xorg",
-        "gnome",
         "gnome-tweaks",
-        "chrome-gnome-shell",
-        "gdm",
     ]);
     enable_dm("gdm");
 }