Run cargo fmt

axtloss/rework-partitioning
axtlos 2 years ago
parent 1dae723b61
commit 604b156699

@ -190,14 +190,9 @@ pub fn install_flatpak() {
pub fn install_zram() { pub fn install_zram() {
install(vec!["zram-generator"]); install(vec!["zram-generator"]);
files::create_file( files::create_file("/mnt/etc/systemd/zram-generator.conf");
"/mnt/etc/systemd/zram-generator.conf"
);
files_eval( files_eval(
files::append_file( files::append_file("/mnt/etc/systemd/zram-generator.conf", "[zram0]"),
"/mnt/etc/systemd/zram-generator.conf", "Write zram-generator config",
"[zram0]"
),
"Write zram-generator config"
); );
} }

@ -46,9 +46,13 @@ pub fn set_locale(locale: String) {
files::sed_file( files::sed_file(
"/mnt/etc/locale.conf", "/mnt/etc/locale.conf",
"en_US.UTF-8", "en_US.UTF-8",
locale.split(' ').collect::<Vec<&str>>()[i] locale.split(' ').collect::<Vec<&str>>()[i],
), ),
format!("Set locale {} in /etc/locale.conf", locale.split(' ').collect::<Vec<&str>>()[i]).as_str() format!(
"Set locale {} in /etc/locale.conf",
locale.split(' ').collect::<Vec<&str>>()[i]
)
.as_str(),
); );
} }
} }

@ -12,10 +12,7 @@ pub fn fmt_mount(mountpoint: &str, filesystem: &str, blockdevice: &str) {
"vfat" => exec_eval( "vfat" => exec_eval(
exec( exec(
"mkfs.vfat", "mkfs.vfat",
vec![ vec![String::from("-F32"), String::from(blockdevice)],
String::from("-F32"),
String::from(blockdevice),
],
), ),
format!("Formatting {blockdevice} as vfat").as_str(), format!("Formatting {blockdevice} as vfat").as_str(),
), ),
@ -291,7 +288,10 @@ fn part_nvme(device: &Path, efi: bool, unakite: bool) {
let device = device.to_string_lossy().to_string(); let device = device.to_string_lossy().to_string();
if efi && !unakite { if efi && !unakite {
exec_eval( exec_eval(
exec("mkfs.vfat", vec![String::from("-F32"), format!("{}p1", device)]), exec(
"mkfs.vfat",
vec![String::from("-F32"), format!("{}p1", device)],
),
format!("format {}p1 as fat32", device).as_str(), format!("format {}p1 as fat32", device).as_str(),
); );
exec_eval( exec_eval(
@ -389,7 +389,10 @@ fn part_nvme(device: &Path, efi: bool, unakite: bool) {
mount(format!("{}p1", device).as_str(), "/mnt/boot", ""); mount(format!("{}p1", device).as_str(), "/mnt/boot", "");
} else if efi && unakite { } else if efi && unakite {
exec_eval( exec_eval(
exec("mkfs.vfat", vec![String::from("-F32"), format!("{}p1", device)]), exec(
"mkfs.vfat",
vec![String::from("-F32"), format!("{}p1", device)],
),
format!("format {}p1 as fat32", device).as_str(), format!("format {}p1 as fat32", device).as_str(),
); );
exec_eval( exec_eval(
@ -499,7 +502,10 @@ fn part_disk(device: &Path, efi: bool, unakite: bool) {
let device = device.to_string_lossy().to_string(); let device = device.to_string_lossy().to_string();
if efi && !unakite { if efi && !unakite {
exec_eval( exec_eval(
exec("mkfs.vfat", vec![String::from("-F32"), format!("{}1", device)]), exec(
"mkfs.vfat",
vec![String::from("-F32"), format!("{}1", device)],
),
format!("format {}1 as fat32", device).as_str(), format!("format {}1 as fat32", device).as_str(),
); );
exec_eval( exec_eval(
@ -589,7 +595,10 @@ fn part_disk(device: &Path, efi: bool, unakite: bool) {
mount(format!("{}1", device).as_str(), "/mnt/boot", ""); mount(format!("{}1", device).as_str(), "/mnt/boot", "");
} else if efi && unakite { } else if efi && unakite {
exec_eval( exec_eval(
exec("mkfs.vfat", vec![String::from("-F32"), format!("{}1", device)]), exec(
"mkfs.vfat",
vec![String::from("-F32"), format!("{}1", device)],
),
format!("format {}1 as fat32", device).as_str(), format!("format {}1 as fat32", device).as_str(),
); );
exec_eval( exec_eval(

Loading…
Cancel
Save