Revert "interesting"

This reverts commit c4fdd83.

Author: Sk7Str1p3

Cargo.lock

@@ -11,7 +11,7 @@ members = ["ascii", "image", "manifest"]
 [workspace.dependencies]
 owo-colors = "4.2.0"
 anyhow = "1.0"
-clap = { version = "4.5.34", features = ["derive","string", ] }
+clap = { version = "4.5.34", features = ["derive"] }
 image = { version = "0.25.5", default-features = false, features = [
     "color_quant",
     "jpeg",

Cargo.toml

@@ -1,9 +1,8 @@
-use crate::config::ConfigOptions;
 use crate::info::langs::language::{Language, LanguageType};
 use crate::info::utils::info_field::InfoType;
 use crate::ui::printer::SerializationFormat;
 use anyhow::Result;
-use clap::builder::{OsStr, PossibleValuesParser};
+use clap::builder::PossibleValuesParser;
 use clap::builder::TypedValueParser as _;
 use clap::{value_parser, Args, Command, Parser, ValueHint};
 use clap_complete::{generate, Generator, Shell};
@@ -55,8 +54,7 @@ pub struct InfoCliOptions {
         num_args = 1..,
         hide_possible_values = true,
         value_enum,
-        value_name = "FIELD",
-        default_value = Vec::<String>::new().join(""),
+        value_name = "FIELD"
     )]
     pub disabled_fields: Vec<InfoType>,
     /// Hides the title
@@ -221,10 +219,9 @@ pub struct VisualsCliOptions {
 #[command(next_help_heading = "CONFIG")]
 pub struct ConfigCliOptions {
     /// Path to the config file
-    #[arg(long, value_hint = ValueHint::FilePath, default_value = ConfigCliOptions::default().config_path.into_os_string())]
-    pub config_path: PathBuf,
+    #[arg(long, value_hint = ValueHint::FilePath)]
+    pub config_path: Option<PathBuf>,
     /// Creates a default config file
-    ///
     /// Writes to $XDG_CONFIG_HOME/onefetch/config.toml but can be overridden with --config-path
     #[arg(long)]
     pub generate_config: bool,
@@ -324,9 +321,7 @@ impl Default for ConfigCliOptions {
     fn default() -> Self {
         ConfigCliOptions {
             // Not sure about unwrap
-            config_path: dirs::config_dir()
-                .expect("Could not find $HOME!")
-                .join("onefetch/config.toml"),
+            config_path: Some(dirs::config_dir().expect("Could not find $HOME!").join("onefetch/config.toml")),
             generate_config: false,
         }
     }

src/cli.rs

@@ -6,10 +6,8 @@ use human_panic::setup_panic;
 use onefetch::cli::{self, CliOptions};
 use onefetch::config::ConfigOptions;
 use onefetch::info::build_info;
-use onefetch::info::utils::info_field::InfoType;
 use onefetch::ui::printer::Printer;
 use std::io;
-use std::process::exit;
 
 fn main() -> Result<()> {
     setup_panic!();
@@ -34,20 +32,22 @@ fn main() -> Result<()> {
     }
 
     if cli_options.config.generate_config {
-        return ConfigOptions::default().write(&cli_options.config.config_path);
+        return ConfigOptions::default().write(
+            &cli_options.config.config_path.unwrap_or(
+                dirs::config_dir()
+                    .expect("Could not find config dir!")
+                    .join("onefetch/config.toml"),
+            ),
+        );
     }
 
-    let config_options = ConfigOptions::read(&cli_options.config.config_path);
-
-    {
-        let merged_disabled: Vec<InfoType> = config_options
-            .disabled_fields
-            .into_iter()
-            .chain(cli_options.info.disabled_fields)
-            .collect();
-        println!("{:?}", merged_disabled);
-        exit(0)
-    }
+    let config_options = ConfigOptions::read(
+        &cli_options.config.config_path.as_ref().unwrap_or(
+            &dirs::config_dir()
+                .expect("Could not find config dir!")
+                .join("onefetch/config.toml"),
+        ),
+    );
 
     let info = build_info(&cli_options, &config_options)?;