add config path to config struct

Author: AnActualEmerald

src/config.rs

@@ -11,18 +11,25 @@ use serde::{Deserialize, Serialize};
 lazy_static! {
     pub static ref DIRS: ProjectDirs =
         ProjectDirs::from("me", "greenboi", "Papa").expect("Unable to find base dirs");
-    pub static ref CONFIG: Config = Figment::from(Serialized::defaults(Config::default()))
-        .merge(Toml::file(DIRS.config_dir().join("config.toml")))
-        .merge(Env::prefixed("PAPA_"))
-        .extract()
-        .expect("Error reading configuration");
+    pub static ref CONFIG: Config = {
+        let path = DIRS.config_dir().join("config.toml");
+        let mut cfg: Config = Figment::from(Serialized::defaults(Config::default()))
+            .merge(Toml::file(&path))
+            .merge(Env::prefixed("PAPA_"))
+            .extract()
+            .expect("Error reading configuration");
+        cfg.config_path = Some(path);
+        cfg
+    };
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Config {
     game_dir: Option<PathBuf>,
     install_dir: PathBuf,
     is_server: bool,
+    #[serde(skip)]
+    pub config_path: Option<PathBuf>,
 }
 
 impl Config {
@@ -57,6 +64,7 @@ impl Default for Config {
             game_dir: None,
             install_dir: "./mods".into(),
             is_server: false,
+            config_path: None,
         }
     }
 }

src/core/commands/env.rs

@@ -15,5 +15,10 @@ pub fn env() -> Result<()> {
         "Cache directory: {}",
         DIRS.cache_dir().display().bright_cyan()
     );
+
+    if let Some(path) = &CONFIG.config_path {
+        println!("\nConfig file: {}", path.display().bright_cyan());
+    }
+
     Ok(())
 }