Merge pull request #63 from tsirysndr/fix/home-manager-install

fix: install home-manager if not installed
tsirysndr · Jun 22, 2023 · 24c7f73 · 24c7f73
2 parents 0e1a683 + e36d2cb
commit 24c7f73
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 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.2"
+version = "0.4.3"
 
 # 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.5"}
+crosup-installers = {path = "../installers", version = "0.1.6"}
 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,7 +7,7 @@ keywords = ["chromebook", "chromeos", "homebrew", "docker", "nix"]
 license = "MIT"
 name = "crosup-installers"
 repository = "https://github.com/tsirysndr/crosup"
-version = "0.1.5"
+version = "0.1.6"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

diff --git a/crates/installers/src/home_manager.rs b/crates/installers/src/home_manager.rs
@@ -59,6 +59,14 @@ impl HomeManagerInstaller {
             "nix run home-manager/master -- init".bright_green()
         );
         home_manager_init!(self.session.clone());
+
+        println!(
+            "-> Running {}",
+            "nix profile install home-manager/master".bright_green()
+        );
+        let nix_env = ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh";
+        let command = format!("{} && nix profile install home-manager/master", nix_env);
+        exec_bash_with_output!(command, self.session.clone());
         Ok(())
     }