diff --git a/zellij-utils/src/cli.rs b/zellij-utils/src/cli.rs index 6f0ac59a..f860f05f 100644 --- a/zellij-utils/src/cli.rs +++ b/zellij-utils/src/cli.rs @@ -48,15 +48,6 @@ pub struct CliArgs { pub debug: bool, } -impl CliArgs { - pub fn should_clean_config(&self) -> bool { - match &self.command { - Some(Command::Setup(ref setup)) => setup.clean, - _ => false, - } - } -} - #[derive(Debug, Subcommand, Clone, Serialize, Deserialize)] pub enum Command { /// Change the behaviour of zellij diff --git a/zellij-utils/src/setup.rs b/zellij-utils/src/setup.rs index a4b3e202..3bce5237 100644 --- a/zellij-utils/src/setup.rs +++ b/zellij-utils/src/setup.rs @@ -211,14 +211,9 @@ impl Setup { /// (`layout.yaml` / `zellij --layout`) /// 3. config options (`config.yaml`) pub fn from_cli_args(cli_args: &CliArgs) -> Result<(Config, Layout, Options), ConfigError> { - let clean = cli_args.should_clean_config(); // note that this can potentially exit the process Setup::handle_setup_commands(cli_args); - let config = if clean { - Config::default() - } else { - Config::try_from(cli_args)? - }; + let config = Config::try_from(cli_args)?; let cli_config_options: Option = if let Some(Command::Options(options)) = cli_args.command.clone() { Some(options.into())