+

src/cmd/check.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use eyre::{Context, ContextCompat, Result, eyre};
 use log::debug;
 
@@ -6,13 +8,13 @@ use crate::util::secmap::{RencBuilder, RencCtx};
 use super::renc::CompleteProfile;
 
 impl CompleteProfile<'_> {
-    pub fn check(&self) -> Result<()> {
+    pub fn check(&self, flake_root: PathBuf) -> Result<()> {
         let profile = self
             .inner_ref()
             .first()
             .with_context(|| eyre::eyre!("deploy must only one host"))?;
 
-        let ctx = RencCtx::create(self)?;
+        let ctx = RencCtx::create(self, Some(flake_root))?;
 
         let inst = RencBuilder::create(self)
             .build_instore()

src/cmd/deploy.rs

@@ -155,7 +155,7 @@ impl Profile {
         let templates = self.templates.iter().filter(|i| if_early(i.0));
 
         let complete = CompleteProfile::from_iter(iter::once(self));
-        let ctx = RencCtx::create(&complete)?;
+        let ctx = RencCtx::create(&complete, None)?;
 
         let plain_map = RencBuilder::create(&complete)
             .build_instore()

src/cmd/mod.rs

@@ -1,6 +1,6 @@
 use std::{fs, path::PathBuf};
 
-use eyre::{eyre, Context, ContextCompat};
+use eyre::{Context, ContextCompat, eyre};
 use log::info;
 use renc::CompleteProfile;
 use {argh::FromArgs, std::fmt::Debug};
@@ -123,7 +123,7 @@ impl Args {
             SubCmd::Check(_) => {
                 info!("start checking");
                 let profile = profile()?;
-                CompleteProfile::from_iter(&profile).check()?;
+                CompleteProfile::from_iter(&profile).check(flake_root)?;
                 info!("check complete");
                 Ok(())
             }

src/cmd/renc.rs

@@ -48,7 +48,7 @@ impl<'a> CompleteProfile<'a> {
             bail!("`flake.nix` not found here, make sure run in flake toplevel.");
         };
 
-        let ctx = RencCtx::create(&self)?;
+        let ctx = RencCtx::create(&self, None)?;
         let mut materia = RencBuilder::create(&self).build_inrepo(&ctx, cache_path.clone());
         materia.clean_outdated(cache_path)?;
         materia.retain_noexist();

src/util/secmap.rs

@@ -104,22 +104,34 @@ impl<'a, B> RencCtx<'a, B> {
 }
 
 impl<'a> RencCtx<'a, AgeEnc> {
-    pub fn create(material: &'a CompleteProfile) -> Result<Self> {
+    pub fn create(material: &'a CompleteProfile, flake_root: Option<PathBuf>) -> Result<Self> {
         let c: DashMap<&Secret, Result<SecBuf<AgeEnc>>> = material
             .inner_ref()
             .iter()
             .flat_map(|x| x.secrets.values())
             .map(|i| {
+                let file = {
+                    let file_pathbuf = PathBuf::from(&i.file);
+
+                    if flake_root.is_some() && file_pathbuf.is_relative() {
+                        let mut flake_root = flake_root.clone().expect("yes");
+                        flake_root.push(file_pathbuf);
+                        flake_root
+                    } else {
+                        file_pathbuf
+                    }
+                };
                 (
                     i,
-                    PathBuf::from(i.file.clone())
-                        .canonicalize()
-                        .wrap_err_with(|| eyre!("secret not found: {}", i.file))
-                        .and_then(|i| {
-                            SecPathBuf::<InStore>::from(&i)
-                                .read_buffer()
-                                .map(SecBuf::new)
-                        }),
+                    ({
+                        file.canonicalize()
+                            .wrap_err_with(|| eyre!("secret not found: {}", i.file))
+                            .and_then(|i| {
+                                SecPathBuf::<InStore>::from(&i)
+                                    .read_buffer()
+                                    .map(SecBuf::new)
+                            })
+                    }),
                 )
             })
             .collect();