darwin.rs: use darwin-rebuild

Recommended to use the darwin-rebuild activate command by maintainers.

Author: khaneliman

CHANGELOG.md

@@ -18,6 +18,7 @@
 
 ### Changed
 
+- Darwin: Use `darwin-rebuild` directly for activation instead of old scripts
 - Darwin: Future-proof handling of `activate-user` script removal
 - Darwin: Improve compatibility with root-only activation in newer nix-darwin versions
 

src/darwin.rs

@@ -126,36 +126,27 @@ impl DarwinRebuildArgs {
                 .args(["build", "--no-link", "--profile", SYSTEM_PROFILE])
                 .arg(out_path.get_path())
                 .elevate(true)
-                .dry(self.common.dry);
+                .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 user_activation = Command::new(activate_user.clone())
-                .message("Activating configuration for user")
-                .dry(self.common.dry);
-
-            let activate = out_path.get_path().join("activate");
+            // Determine if we need to elevate privileges
+            let needs_elevation = !activate_user
+                .try_exists()
+                .context("Failed to check if activate-user file exists")?
+                || std::fs::read_to_string(&activate_user)
+                    .context("Failed to read activate-user file")?
+                    .contains("# nix-darwin: deprecated");
 
-            let activation = Command::new(activate)
-                .elevate(true)
+            // Create and run the activation command with or without elevation
+            Command::new(darwin_rebuild)
+                .arg("activate")
                 .message("Activating configuration")
-                .dry(self.common.dry);
-
-            if activate_user.exists() {
-                // Check whether activate-user is deprecated
-                // If it is, only activate with root
-                if std::fs::read_to_string(&activate_user)
-                    .context("Failed to read activate-user file")?
-                    .contains("# nix-darwin: deprecated")
-                {
-                    activation.run()?;
-                } else {
-                    user_activation.run()?;
-                    activation.run()?;
-                }
-            } else {
-                activation.run()?;
-            }
+                .elevate(needs_elevation)
+                .dry(self.common.dry)
+                .run()?;
         }
 
         // Make sure out_path is not accidentally dropped