Merge pull request #62 from tsirysndr/fix/home-manager-init

fix: home manager init
tsirysndr · Jun 22, 2023 · 0e1a683 · 0e1a683
2 parents 1033c06 + e1f4aeb
commit 0e1a683
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT"
 name = "crosup"
 readme = "../../README.md"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.4.1"
+version = "0.4.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -17,7 +17,7 @@ anyhow = "1.0.71"
 clap = "3.2.20"
 crosup-core = {path = "../core", version = "0.1.7"}
 crosup-entity = {version = "0.1.0", path = "../entity"}
-crosup-installers = {path = "../installers", version = "0.1.4"}
+crosup-installers = {path = "../installers", version = "0.1.5"}
 crosup-nix = {path = "../nix", version = "0.1.1"}
 crosup-repo = {path = "../repo", version = "0.1.0"}
 crosup-ssh = {path = "../ssh", version = "0.1.0"}

diff --git a/crates/installers/Cargo.toml b/crates/installers/Cargo.toml
@@ -7,13 +7,13 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
 license = "MIT"
 name = "crosup-installers"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.1.4"
+version = "0.1.5"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = "1.0.71"
-crosup-macros = {path = "../macros", version = "0.1.3"}
+crosup-macros = {path = "../macros", version = "0.1.4"}
 crosup-nix = {path = "../nix", version = "0.1.1"}
 crosup-ssh = {path = "../ssh", version = "0.1.0"}
 crosup-types = {path = "../types", version = "0.1.4"}

diff --git a/crates/installers/src/home_manager.rs b/crates/installers/src/home_manager.rs
@@ -1,5 +1,5 @@
 use anyhow::Error;
-use crosup_macros::{check_version, exec_bash_with_output};
+use crosup_macros::{check_version, exec_bash_with_output, home_manager_init};
 use crosup_types::home_manager::Package;
 use owo_colors::OwoColorize;
 use ssh2::Session;
@@ -58,6 +58,7 @@ impl HomeManagerInstaller {
             "-> Running {}",
             "nix run home-manager/master -- init".bright_green()
         );
+        home_manager_init!(self.session.clone());
         Ok(())
     }
 

diff --git a/crates/macros/Cargo.toml b/crates/macros/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
 license = "MIT"
 name = "crosup-macros"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.1.3"
+version = "0.1.4"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/crates/macros/src/lib.rs b/crates/macros/src/lib.rs
@@ -492,6 +492,36 @@ macro_rules! fleek_install {
     };
 }
 
+#[macro_export]
+macro_rules! home_manager_init {
+    ($session:expr) => {
+        match $session {
+            Some(session) => {
+                let command = format!("bash -c '. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix run home-manager/master -- init'");
+                crosup_ssh::exec(session.clone(), &command)?;
+            }
+            None => {
+                let mut child = std::process::Command::new("bash")
+                    .arg("-c")
+                    .arg(format!(". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix run home-manager/master -- init"))
+                    .stdin(Stdio::piped())
+                    .stdout(Stdio::piped())
+                    .spawn()?;
+                let output = child.stdout.take().unwrap();
+                let output = std::io::BufReader::new(output);
+
+                for line in output.lines() {
+                    println!("{}", line?);
+                }
+                let status = child.wait()?;
+                if !status.success() {
+                    return Err(Error::msg(format!("Failed to initialize home-manager")));
+                }
+            }
+        };
+    };
+}
+
 #[macro_export]
 macro_rules! exec_sudo {
     ($command:expr, $session:expr) => {