From ee732012af5295aa3aa4e9f0ca06b23c13745730 Mon Sep 17 00:00:00 2001 From: "Antiz (Robin C.)" Date: Tue, 3 Jan 2023 20:35:38 +0100 Subject: [PATCH] Switch i3-gaps to i3(-wm) --- src/args.rs | 4 ++-- src/functions/desktops.rs | 6 +++--- src/internal/config.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/args.rs b/src/args.rs index 6340e35..f4d6b23 100644 --- a/src/args.rs +++ b/src/args.rs @@ -270,8 +270,8 @@ pub enum DesktopSetup { #[clap(name = "sway")] Sway, - #[clap(name = "i3gaps")] - I3gaps, + #[clap(name = "i3")] + I3, #[clap(name = "herbstluftwm")] Herbstluftwm, diff --git a/src/functions/desktops.rs b/src/functions/desktops.rs index bff3ee6..7d43b71 100644 --- a/src/functions/desktops.rs +++ b/src/functions/desktops.rs @@ -15,7 +15,7 @@ pub fn install_desktop_setup(desktop_setup: DesktopSetup) { DesktopSetup::Enlightenment => install_enlightenment(), DesktopSetup::Lxqt => install_lxqt(), DesktopSetup::Sway => install_sway(), - DesktopSetup::I3gaps => install_i3gaps(), + DesktopSetup::I3 => install_i3(), DesktopSetup::Herbstluftwm => install_herbstluftwm(), DesktopSetup::Awesome => install_awesome(), DesktopSetup::Bspwm => install_bspwm(), @@ -97,10 +97,10 @@ fn install_herbstluftwm() { enable_dm("lightdm"); } -fn install_i3gaps() { +fn install_i3() { install(vec![ "xorg", - "i3-gaps", + "i3-wm", "dmenu", "i3lock", "i3status", diff --git a/src/internal/config.rs b/src/internal/config.rs index deb8c7a..d2e14eb 100755 --- a/src/internal/config.rs +++ b/src/internal/config.rs @@ -176,7 +176,7 @@ pub fn read_config(configpath: PathBuf) { "enlightenment" => desktops::install_desktop_setup(DesktopSetup::Enlightenment), "lxqt" => desktops::install_desktop_setup(DesktopSetup::Lxqt), "sway" => desktops::install_desktop_setup(DesktopSetup::Sway), - "i3-gaps" => desktops::install_desktop_setup(DesktopSetup::I3gaps), + "i3" => desktops::install_desktop_setup(DesktopSetup::I3), "herbstluftwm" => desktops::install_desktop_setup(DesktopSetup::Herbstluftwm), "awesome" => desktops::install_desktop_setup(DesktopSetup::Awesome), "bspwm" => desktops::install_desktop_setup(DesktopSetup::Bspwm),