Replace zramd with zram-generator and fix mkfs.vfat

src/functions/base.rs

@@ -188,12 +188,15 @@ pub fn install_flatpak() {
 }
 
 pub fn install_zram() {
-    install(vec!["zramd"]);
-    exec_eval(
-        exec_chroot(
-            "systemctl",
-            vec![String::from("enable"), String::from("zramd")],
+    install(vec!["zram-generator"]);
+    files::create_file(
+        "/mnt/etc/systemd/zram-generator.conf"
+    );
+    files_eval(
+        files::append_file(
+            "/mnt/etc/systemd/zram-generator.conf",
+            "[zram0]"
         ),
-        "Enable zramd service",
+        "Write zram-generator config"
     );
 }

src/functions/partition.rs

@@ -13,8 +13,7 @@ pub fn fmt_mount(mountpoint: &str, filesystem: &str, blockdevice: &str) {
             exec(
                 "mkfs.vfat",
                 vec![
-                    String::from("-F"),
-                    String::from("32"),
+                    String::from("-F32"),
                     String::from(blockdevice),
                 ],
             ),
@@ -292,7 +291,7 @@ fn part_nvme(device: &Path, efi: bool, unakite: bool) {
     let device = device.to_string_lossy().to_string();
     if efi && !unakite {
         exec_eval(
-            exec("mkfs.vfat", vec![format!("-F32, {}p1", device)]),
+            exec("mkfs.vfat", vec![String::from("-F32"), format!("{}p1", device)]),
             format!("format {}p1 as fat32", device).as_str(),
         );
         exec_eval(
@@ -390,7 +389,7 @@ fn part_nvme(device: &Path, efi: bool, unakite: bool) {
         mount(format!("{}p1", device).as_str(), "/mnt/boot", "");
     } else if efi && unakite {
         exec_eval(
-            exec("mkfs.vfat", vec![format!("-F32 {}p1", device)]),
+            exec("mkfs.vfat", vec![String::from("-F32"), format!("{}p1", device)]),
             format!("format {}p1 as fat32", device).as_str(),
         );
         exec_eval(
@@ -500,7 +499,7 @@ fn part_disk(device: &Path, efi: bool, unakite: bool) {
     let device = device.to_string_lossy().to_string();
     if efi && !unakite {
         exec_eval(
-            exec("mkfs.vfat", vec![format!("-F32 {}1", device)]),
+            exec("mkfs.vfat", vec![String::from("-F32"), format!("{}1", device)]),
             format!("format {}1 as fat32", device).as_str(),
         );
         exec_eval(
@@ -590,7 +589,7 @@ fn part_disk(device: &Path, efi: bool, unakite: bool) {
         mount(format!("{}1", device).as_str(), "/mnt/boot", "");
     } else if efi && unakite {
         exec_eval(
-            exec("mkfs.vfat", vec![format!("-F32 {}1", device)]),
+            exec("mkfs.vfat", vec![String::from("-F32"), format!("{}1", device)]),
             format!("format {}1 as fat32", device).as_str(),
         );
         exec_eval(