fix(config): fix config handleing through rocket

Co-authored-by: Neil Kollack <nkollack@gmail.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/zone_zfs/src/file_system.rs b/zone_zfs/src/file_system.rs
index 3b4cf8d..7c9c6ab 100644
--- a/zone_zfs/src/file_system.rs
+++ b/zone_zfs/src/file_system.rs
@@ -8,8 +8,6 @@ use std::{
     process::{Command, Output},
 };
 
-use crate::Config;
-
 use super::snapshot::Snapshot;
 
 #[derive(Debug)]
diff --git a/zone_zfs/src/lib.rs b/zone_zfs/src/lib.rs
index 7b3342f..53947a6 100644
--- a/zone_zfs/src/lib.rs
+++ b/zone_zfs/src/lib.rs
@@ -1,6 +1,6 @@
 use self::file_system::FileSystem;
 use anyhow::Result;
-use figment::{providers::Serialized, Figment, Metadata, Profile, Provider};
+use figment::{providers::{Serialized, Toml, Env, Format}, Figment, Metadata, Profile, Provider};
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 
@@ -29,6 +29,8 @@ impl Config {
     // Provide a default provider, a `Figment`.
     pub fn figment() -> Figment {
         Figment::from(Config::default())
+            .merge(Toml::file(Env::var_or("ZFS_CONFIG", "ZFS.toml")).nested())
+            .merge(Env::prefixed("ZFS_").global())
     }
 }