Merge pull request #17 from tsirysndr/feat/rtx-extension

feat: add rtx extension

crates/cli/Cargo.toml

@@ -8,18 +8,19 @@ license = "MIT"
 name = "envhub"
 readme = "../../README.md"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.1.0"
+version = "0.2.0"
 
 # 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-hm = {path = "../hm", version = "0.1.0"}
+envhub-ext = {path = "../ext", version = "0.1.0"}
+envhub-hm = {path = "../hm", version = "0.1.2"}
 envhub-pkgs = {path = "../pkgs", version = "0.1.0"}
-envhub-providers = {path = "../providers", version = "0.1.0"}
+envhub-providers = {path = "../providers", version = "0.2.0"}
 envhub-stow = {path = "../stow", version = "0.1.0"}
-envhub-types = {path = "../types", version = "0.1.0"}
+envhub-types = {path = "../types", version = "0.2.0"}
 hcl-rs = "0.14.2"
 owo-colors = "3.5.0"
 tokio = {version = "1.28.2", features = ["full"]}

crates/cli/src/cmd/use.rs

@@ -1,6 +1,7 @@
 use std::fs;
 
 use anyhow::Error;
+use envhub_ext::{rtx::Rtx, Extension};
 use envhub_hm::switch::switch_env;
 use envhub_providers::{github::Github, local::Local, s3::S3, Provider};
 use envhub_stow::stow::stow;
@@ -41,6 +42,11 @@ pub fn use_environment(name: &str) -> Result<(), Error> {
         install_packages(&config)?;
     }
 
+    if config.rtx.is_some() {
+        let rtx: Box<dyn Extension> = Box::new(Rtx::new());
+        rtx.load(&config)?;
+    }
+
     switch_env(Some(&home_manager_dir), &config)?;
 
     let state = toml::to_string(&config)?;

crates/ext/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+authors = ["Tsiry Sandratraina <[email protected]>"]
+categories = ["command-line-utilities"]
+description = "Manage your dotfiles and packages with ease."
+edition = "2021"
+keywords = ["nix", "shell", "environment", "dotfiles"]
+license = "MIT"
+name = "envhub-ext"
+repository = "https://github.com/tsirysndr/envhub"
+version = "0.1.0"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.71"
+envhub-types = {version = "0.2.0", path = "../types"}

crates/ext/src/lib.rs

@@ -0,0 +1,9 @@
+use anyhow::Error;
+use envhub_types::configuration::Configuration;
+
+pub mod rtx;
+
+pub trait Extension {
+    fn load(&self, config: &Configuration) -> Result<(), Error>;
+    fn setup(&self) -> Result<(), Error>;
+}

crates/ext/src/rtx.rs

@@ -0,0 +1,75 @@
+use std::{
+    env, fs,
+    process::{Command, Stdio},
+};
+
+use anyhow::Error;
+use envhub_types::configuration::Configuration;
+
+use crate::Extension;
+
+pub struct Rtx {}
+
+impl Rtx {
+    pub fn new() -> Self {
+        Self {}
+    }
+
+    pub fn install(&self, package: &str) -> Result<(), Error> {
+        let mut child = Command::new("sh")
+            .arg("-c")
+            .arg(format!("rtx install {}", package))
+            .stdin(Stdio::inherit())
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit())
+            .spawn()?;
+        child.wait()?;
+        Ok(())
+    }
+}
+
+impl Extension for Rtx {
+    fn load(&self, config: &Configuration) -> Result<(), Error> {
+        self.setup()?;
+        match config.rtx {
+            Some(ref rtx) => {
+                for package in &rtx.packages {
+                    self.install(package)?;
+                }
+            }
+            None => {}
+        }
+        Ok(())
+    }
+
+    fn setup(&self) -> Result<(), Error> {
+        env::set_var(
+            "PATH",
+            format!(
+                "{}/.local/share/rtx/bin:{}",
+                env::var("HOME")?,
+                env::var("PATH")?
+            ),
+        );
+        env::set_var(
+            "PATH",
+            format!(
+                "{}/.local/share/rtx/shims:{}",
+                env::var("HOME")?,
+                env::var("PATH")?
+            ),
+        );
+        let mut child = Command::new("sh")
+            .arg("-c")
+            .arg("type rtx > /dev/null || curl https://rtx.pub/install.sh | sh")
+            .stdin(Stdio::inherit())
+            .stdout(Stdio::inherit())
+            .stderr(Stdio::inherit())
+            .spawn()?;
+        child.wait()?;
+
+        fs::create_dir_all(format!("{}/.local/share/rtx/shims", env::var("HOME")?))?;
+
+        Ok(())
+    }
+}

crates/hm/Cargo.toml

@@ -7,13 +7,13 @@ keywords = ["nix", "shell", "environment", "dotfiles"]
 license = "MIT"
 name = "envhub-hm"
 repository = "https://github.com/tsirysndr/envhub"
-version = "0.1.0"
+version = "0.1.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.71"
-envhub-types = {version = "0.1.0", path = "../types"}
+envhub-types = {version = "0.2.0", path = "../types"}
 indexmap = {version = "1.9.3", features = ["serde"]}
 nix-editor = "0.3.0"
 rnix = "0.11.0"

crates/providers/Cargo.toml

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

crates/types/Cargo.toml

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

crates/types/src/configuration.rs

@@ -19,6 +19,11 @@ pub struct Packages {
     pub packages: Vec<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, Default)]
+pub struct RtxParams {
+    pub packages: Vec<String>,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, Default)]
 pub struct Configuration {
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -58,4 +63,9 @@ pub struct Configuration {
     pub symlink_manager: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub package_manager: Option<String>,
+    #[serde(
+        skip_serializing_if = "Option::is_none",
+        serialize_with = "hcl::ser::block"
+    )]
+    pub rtx: Option<RtxParams>,
 }

examples/rtx/envhub.hcl

@@ -0,0 +1,9 @@
+packages = [
+  "hello"
+]
+
+rtx {
+  packages = [
+    "[email protected]"
+  ]
+}

flake.nix

@@ -40,7 +40,7 @@
           inherit src;
 
           pname = "envhub";
-          version = "0.1.0";
+          version = "0.2.0";
           cargoExtraArgs = "--package=envhub";
 
           buildInputs = [