|
|
@ -5,7 +5,7 @@ use crate::internal::*;
|
|
|
|
pub fn install_desktop_setup(desktop_setup: DesktopSetup) {
|
|
|
|
pub fn install_desktop_setup(desktop_setup: DesktopSetup) {
|
|
|
|
log::debug!("Installing {:?}", desktop_setup);
|
|
|
|
log::debug!("Installing {:?}", desktop_setup);
|
|
|
|
match desktop_setup {
|
|
|
|
match desktop_setup {
|
|
|
|
// DesktopSetup::Onyx => install_onyx(),
|
|
|
|
DesktopSetup::Onyx => install_onyx(),
|
|
|
|
DesktopSetup::Gnome => install_gnome(),
|
|
|
|
DesktopSetup::Gnome => install_gnome(),
|
|
|
|
DesktopSetup::Kde => install_kde(),
|
|
|
|
DesktopSetup::Kde => install_kde(),
|
|
|
|
DesktopSetup::Budgie => install_budgie(),
|
|
|
|
DesktopSetup::Budgie => install_budgie(),
|
|
|
@ -276,28 +276,24 @@ fn install_kde() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn install_gnome() {
|
|
|
|
fn install_gnome() {
|
|
|
|
install(vec!["xorg", "gnome", "sushi", "gdm"]);
|
|
|
|
install(vec![
|
|
|
|
|
|
|
|
"xorg",
|
|
|
|
|
|
|
|
"gnome",
|
|
|
|
|
|
|
|
"sushi",
|
|
|
|
|
|
|
|
"gdm"
|
|
|
|
|
|
|
|
]);
|
|
|
|
enable_dm("gdm");
|
|
|
|
enable_dm("gdm");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*fn install_onyx() {
|
|
|
|
fn install_onyx() {
|
|
|
|
install(vec![
|
|
|
|
install(vec![
|
|
|
|
"xorg",
|
|
|
|
"xorg",
|
|
|
|
"onyx",
|
|
|
|
"onyx",
|
|
|
|
"lightdm",
|
|
|
|
|
|
|
|
"lightdm-gtk-greeter",
|
|
|
|
|
|
|
|
"lightdm-gtk-greeter-settings",
|
|
|
|
|
|
|
|
"sushi",
|
|
|
|
"sushi",
|
|
|
|
|
|
|
|
"gdm"
|
|
|
|
]);
|
|
|
|
]);
|
|
|
|
files_eval(
|
|
|
|
enable_dm("gdm");
|
|
|
|
files::append_file(
|
|
|
|
}
|
|
|
|
"/mnt/etc/lightdm/lightdm.conf",
|
|
|
|
|
|
|
|
"[SeatDefaults]\ngreeter-session=lightdm-gtk-greeter\n",
|
|
|
|
|
|
|
|
),
|
|
|
|
|
|
|
|
"Add lightdm greeter",
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
enable_dm("lightdm");
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn enable_dm(dm: &str) {
|
|
|
|
fn enable_dm(dm: &str) {
|
|
|
|
log::debug!("Enabling {}", dm);
|
|
|
|
log::debug!("Enabling {}", dm);
|
|
|
|