all: move nh-{command, installable, passthrough, util} into nh-core

Author: faukah

Cargo.lock

@@ -24,16 +24,12 @@ humantime = "2.3.0"
 inquire = { default-features = false, features = [ "crossterm" ], version = "0.9.1" }
 nh = { path = "crates/nh" }
 nh-clean = { path = "crates/nh-clean" }
-nh-command = { path = "crates/nh-command" }
 nh-core = { path = "crates/nh-core" }
 nh-darwin = { path = "crates/nh-darwin" }
 nh-home = { path = "crates/nh-home" }
-nh-installable = { path = "crates/nh-installable" }
 nh-nixos = { path = "crates/nh-nixos" }
-nh-passthrough = { path = "crates/nh-passthrough" }
 nh-remote = { path = "crates/nh-remote" }
 nh-search = { path = "crates/nh-search" }
-nh-util = { path = "crates/nh-util" }
 nix = { default-features = false, features = [ "fs", "user", "hostname" ], version = "0.31.1" }
 proptest = "1.9.0"
 regex = "1.12.2"

Cargo.toml

@@ -17,9 +17,8 @@ clap.workspace       = true
 color-eyre.workspace = true
 humantime.workspace  = true
 inquire.workspace    = true
-nh-command.workspace = true
-nh-util.workspace    = true
 nix.workspace        = true
 regex.workspace      = true
+nh-core.workspace    = true
 tracing.workspace    = true
 yansi.workspace      = true

crates/nh-clean/Cargo.toml

@@ -12,7 +12,7 @@ use color_eyre::{
   eyre::{Context, ContextCompat, bail, eyre},
 };
 use inquire::Confirm;
-use nh_command::{Command, ElevationStrategy};
+use nh_core::command::{Command, ElevationStrategy};
 use nix::{
   errno::Errno,
   fcntl::AtFlags,
@@ -96,7 +96,7 @@ impl args::CleanMode {
       },
       Self::All(args) => {
         if !uid.is_root() {
-          nh_util::self_elevate(elevate);
+          nh_core::util::self_elevate(elevate);
         }
 
         let paths_to_check = [

crates/nh-clean/src/clean.rs

@@ -12,11 +12,20 @@ workspace = true
 [dependencies]
 clap.workspace           = true
 color-eyre.workspace     = true
-nh-installable.workspace = true
-nh-passthrough.workspace = true
-nh-util.workspace        = true
 proptest.workspace       = true
+secrecy.workspace         = true
+tempfile.workspace       = true
+subprocess.workspace      = true
+thiserror.workspace      = true
+which.workspace          = true
+shlex.workspace          = true
+inquire.workspace        = true
+regex.workspace          = true
+nix.workspace            = true
+dix.workspace            = true
 semver.workspace         = true
 serde_json.workspace     = true
 serial_test.workspace    = true
 tracing.workspace        = true
+
+yansi.workspace       = true