Merge pull request #238 from khaneliman/darwin

darwin.rs: handle new root only activation

Author: NotAShelf

CHANGELOG.md

@@ -16,6 +16,12 @@
   support legacy/vulnerable versions of Nix, and encourage users to update if
   they have not yet done so.
 
+### 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
+
 ## 4.0.3
 
 ### Added

src/darwin.rs

@@ -129,18 +129,22 @@ impl DarwinRebuildArgs {
                 .dry(self.common.dry)
                 .run()?;
 
-            let switch_to_configuration = out_path.get_path().join("activate-user");
-
-            Command::new(switch_to_configuration)
-                .message("Activating configuration for user")
-                .dry(self.common.dry)
-                .run()?;
-
-            let switch_to_configuration = out_path.get_path().join("activate");
-
-            Command::new(switch_to_configuration)
-                .elevate(true)
+            let darwin_rebuild = out_path.get_path().join("sw/bin/darwin-rebuild");
+            let activate_user = out_path.get_path().join("activate-user");
+
+            // 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");
+
+            // Create and run the activation command with or without elevation
+            Command::new(darwin_rebuild)
+                .arg("activate")
                 .message("Activating configuration")
+                .elevate(needs_elevation)
                 .dry(self.common.dry)
                 .run()?;
         }