unbreak darwin(?)

Author: NotAShelf

src/darwin.rs

@@ -54,7 +54,7 @@ impl DarwinRebuildArgs {
             platform::resolve_env_installable("NH_DARWIN_FLAKE", self.common.installable.clone());
 
         // Build the configuration
-        let _target_profile = platform::handle_rebuild_workflow(
+        let target_profile = platform::handle_rebuild_workflow(
             installable,
             "darwinConfigurations",
             &["toplevel"],
@@ -71,6 +71,7 @@ impl DarwinRebuildArgs {
             false, // Don't skip comparison
         )?;
 
+        // Check if user wants to proceed with applying the configuration
         if self.common.ask && !self.common.dry && !matches!(variant, Build) {
             info!("Apply the config?");
             let confirmation = dialoguer::Confirm::new().default(false).interact()?;
@@ -81,15 +82,18 @@ impl DarwinRebuildArgs {
         }
 
         if matches!(variant, Switch) && !self.common.dry {
+            // Clone target_profile to avoid moved value errors
+            let target_profile_path = target_profile.clone();
+
             Command::new("nix")
                 .args(["build", "--no-link", "--profile", SYSTEM_PROFILE])
-                .arg(out_path.get_path())
+                .arg(target_profile_path.as_path())
                 .elevate(true)
                 .dry(self.common.dry)
                 .run()?;
 
-            let darwin_rebuild = out_path.get_path().join("sw/bin/darwin-rebuild");
-            let activate_user = out_path.get_path().join("activate-user");
+            let darwin_rebuild = target_profile_path.join("sw/bin/darwin-rebuild");
+            let activate_user = target_profile_path.join("activate-user");
 
             // Determine if we need to elevate privileges
             let needs_elevation = !activate_user.try_exists().unwrap_or(false)
@@ -120,18 +124,15 @@ impl DarwinReplArgs {
         let installable = platform::resolve_env_installable("NH_DARWIN_FLAKE", self.installable);
 
         // Get hostname for the configuration
-        let hostname = match self.hostname {
-            Some(h) => h,
-            None => crate::util::get_hostname()?,
-        };
+        let (hostname, _) = platform::get_target_hostname(self.hostname, false)?;
 
         // Start an interactive Nix REPL with the darwin configuration
         platform::run_repl(
             installable,
             "darwinConfigurations",
             &[], // No extra path needed
             Some(hostname),
-            &[], // No extra arguments
+            &[], // No extra args
         )
     }
 }