diff --git a/.gitignore b/.gitignore index 69dd811..34537f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,8 @@ /target +# Main nix files flake.nix configuration.nix home.nix +# Extra nix files garrus.nix +gnome.nix diff --git a/src/main.rs b/src/main.rs index 029f4e5..07e809f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,12 +20,12 @@ fn format_drive(drive_name: &str) -> rsfdisk::Result<()> { disk.partition_table_create(PartitionTableKind::GPT)?; - let partition_type = PartitionKind::builder() - .guid(Guid::LinuxRootx86_64) + let boot_type = PartitionKind::builder() + .guid(Guid::EfiSystem) .build()?; let boot = Partition::builder() - .partition_type(partition_type.clone()) + .partition_type(boot_type.clone()) .name("EFI") //Assuming 512 bytes per sector, 2_097_152 sectors <=> 1 GiB. .size_in_sectors(2_097_152) @@ -33,8 +33,12 @@ fn format_drive(drive_name: &str) -> rsfdisk::Result<()> { let _ = disk.partition_add(boot)?; + let root_type = PartitionKind::builder() + .guid(Guid::LinuxRootx86_64) + .build()?; + let root = Partition::builder() - .partition_type(partition_type) + .partition_type(root_type) .name("Root") // Flash drive testing // .size_in_sectors(121_634_816) @@ -169,6 +173,22 @@ fn grab_home() { } } +fn grab_gnome(){ + let mut gnome_config = Easy::new(); + gnome_config.url("https://gitlab.com/ahoneybun/nix-configs/-/raw/main/desktops/gnome.nix").unwrap(); + + let mut config_file = File::create("gnome.nix").unwrap(); + + { + let mut transfer = gnome_config.transfer(); + transfer.write_function(|data| { + config_file.write_all(data).unwrap(); + Ok(data.len()) + }).unwrap(); + transfer.perform().unwrap(); + } +} + fn main() { println!("--------------------------------------"); println!("| Welcome to the Nyxi Installer 2.0! |"); @@ -217,16 +237,16 @@ fn main() { grab_flake(); grab_config(); grab_home(); + grab_gnome(); let _nixos_gen_config = Command::new("nixos-generate-config") - .arg("no-file-systems") .arg("--root") .arg("/mnt") .output() .expect("Failed to execute command"); // Copies the nix files to /mnt/etc/nixos/ - let _nix_copy = Command::new("cp") + let _nix_copy = Command::new("mv") .arg("flake.nix") .arg("configuration.nix") .arg("home.nix") @@ -267,8 +287,9 @@ fn main() { } // Copies the system nix files to /mnt/etc/nixos/ - let _nix_copy = Command::new("cp") + let _garrus_nix_copy = Command::new("cp") .arg("garrus.nix") + .arg("gnome.nix") .arg("/mnt/etc/nixos") .output() .expect("Failed to copy nix files over");