Allow user override of the nix store volume name

src/action/macos/encrypt_apfs_volume.rs

@@ -37,12 +37,12 @@ impl EncryptApfsVolume {
     ) -> Result<StatefulAction<Self>, ActionError> {
         let name = name.as_ref().to_owned();
         let disk = disk.as_ref().to_path_buf();
-
+        println!("Volume name is {0}", name);
         let mut command = Command::new("/usr/bin/security");
         command.args(["find-generic-password", "-a"]);
         command.arg(&name);
         command.arg("-s");
-        command.arg("Nix Store");
+        command.arg(&name);
         command.arg("-l");
         command.arg(format!("{} encryption password", disk.display()));
         command.arg("-D");
@@ -186,7 +186,7 @@ impl Action for EncryptApfsVolume {
             "-a",
             self.name.as_str(),
             "-s",
-            "Nix Store",
+            self.name.as_str(),
             "-l",
             format!("{} encryption password", disk_str).as_str(),
             "-D",

src/planner/macos/mod.rs

@@ -227,6 +227,11 @@ impl Planner for Macos {
         }
 
         if self.settings.determinate_nix {
+            println!("Creating determinate nix volume {0}", self.volume_label);
+            println!(
+                "Installer volume label: {}",
+                std::env::var("NIX_INSTALLER_VOLUME_LABEL").unwrap_or_default()
+            );
             plan.push(
                 CreateDeterminateNixVolume::plan(
                     root_disk.unwrap(), /* We just ensured it was populated */
@@ -513,3 +518,31 @@ impl HasExpectedErrors for MacosError {
         }
     }
 }
+
+#[cfg(all(test, feature = "cli"))]
+mod tests {
+    use super::*;
+    use clap::Parser;
+
+    #[tokio::test]
+    async fn test_volume_label() {
+        // Test default value
+        std::env::remove_var("NIX_INSTALLER_VOLUME_LABEL");
+        let macos = Macos::parse_from(Vec::<String>::new());
+        assert_eq!(
+            macos.volume_label, "Nix Store",
+            "Default value should be 'Nix Store'"
+        );
+
+        // Test env var override
+        std::env::set_var("NIX_INSTALLER_VOLUME_LABEL", "Custom Volume");
+        let macos = Macos::parse_from(Vec::<String>::new());
+        assert_eq!(
+            macos.volume_label, "Custom Volume",
+            "Environment variable should override default"
+        );
+
+        // Cleanup
+        std::env::remove_var("NIX_INSTALLER_VOLUME_LABEL");
+    }
+}