Merge pull request #35 from tsirysndr/feat/load-secrets-from-env

feat: load secrets from env

README.md

@@ -106,6 +106,6 @@ You can use EnvHub as a [GitHub Action](https://github.com/tsirysndr/setup-envhu
 ```yaml
 - uses: tsirysndr/setup-envhub@v1
   with:
-    version: 'v0.2.9'
+    version: 'v0.2.10'
 - run: envhub --help
 ```

crates/cli/Cargo.toml

@@ -8,15 +8,15 @@ license = "MIT"
 name = "envhub"
 readme = "../../README.md"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.2.9"
+version = "0.2.10"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.71"
 clap = "3.2.20"
 envhub-ext = {path = "../ext", version = "0.1.0"}
-envhub-hm = {path = "../hm", version = "0.1.4"}
+envhub-hm = {path = "../hm", version = "0.1.5"}
 envhub-pkgs = {path = "../pkgs", version = "0.1.2"}
 envhub-providers = {path = "../providers", version = "0.2.0"}
 envhub-stow = {path = "../stow", version = "0.1.0"}

crates/cli/src/helpers.rs

@@ -221,6 +221,10 @@ pub fn save_secrets(config: &Configuration) -> Result<(), Error> {
         let mut secrets_map = IndexMap::new();
 
         for secret in secrets {
+            if let Ok(value) = env::var(&secret) {
+                secrets_map.insert(secret, value);
+                continue;
+            }
             let value = Password::new(&secret)
                 .with_display_toggle_enabled()
                 .with_display_mode(PasswordDisplayMode::Masked)

crates/hm/Cargo.toml

@@ -7,7 +7,7 @@ keywords = ["nix", "shell", "environment", "dotfiles"]
 license = "MIT"
 name = "envhub-hm"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.1.4"
+version = "0.1.5"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/hm/src/switch.rs

@@ -30,11 +30,19 @@ pub fn switch_env(dir: Option<&str>, config: &Configuration) -> Result<(), Error
             if sm == "home-manager" {
                 updated_home_nix =
                     add_files(&updated_home_nix, config.files.clone().unwrap_or_default())?;
+                if config.envs.is_some() {
+                    updated_home_nix =
+                        add_envs(&updated_home_nix, config.envs.clone().unwrap_or_default())?;
+                }
             }
         }
         None => {
             updated_home_nix =
                 add_files(&updated_home_nix, config.files.clone().unwrap_or_default())?;
+            if config.envs.is_some() {
+                updated_home_nix =
+                    add_envs(&updated_home_nix, config.envs.clone().unwrap_or_default())?;
+            }
         }
     }
 
@@ -114,3 +122,19 @@ pub fn add_files(
     let result = nix_editor::write::write(content, "home.file", &entry)?;
     Ok(result)
 }
+
+pub fn add_envs(content: &str, envs: IndexMap<String, String>) -> Result<String, Error> {
+    let mut entry = String::new();
+
+    if envs.is_empty() {
+        return Ok(content.into());
+    }
+
+    entry.push_str("{\n");
+    for (env, value) in envs {
+        entry.push_str(&format!("  \"{}\" = \"{}\";\n", env, value));
+    }
+    entry.push_str("}\n");
+    let result = nix_editor::write::write(content, "home.sessionVariables", &entry)?;
+    Ok(result)
+}

demo/envhub.hcl

@@ -2,6 +2,10 @@ packages = [
   "hello"
 ]
 
+envs {
+  EDITOR = "vim"
+}
+
 file ".screenrc" {
   source = "dotfiles/.screenrc"
 }