Groom plan synopsis (#338)

* Groom plan synopsis * Review nits
DeterminateSystems · Mar 16, 2023 · c55a59b · c55a59b
1 parent 89094e0
commit c55a59b
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 30 deletions.
diff --git a/src/action/common/configure_init_service.rs b/src/action/common/configure_init_service.rs
@@ -292,8 +292,8 @@ impl Action for ConfigureInitService {
                 vec![ActionDescription::new(
                     "Unconfigure Nix daemon related settings with systemd".to_string(),
                     vec![
-                        "Run `systemctl disable {SOCKET_SRC}`".to_string(),
-                        "Run `systemctl disable {SERVICE_SRC}`".to_string(),
+                        format!("Run `systemctl disable {SOCKET_SRC}`"),
+                        format!("Run `systemctl disable {SERVICE_SRC}`"),
                         "Run `systemd-tempfiles --remove --prefix=/nix/var/nix`".to_string(),
                         "Run `systemctl daemon-reload`".to_string(),
                     ],

diff --git a/src/cli/subcommand/install.rs b/src/cli/subcommand/install.rs
@@ -198,6 +198,7 @@ impl CommandExecute for Install {
                         match interaction::prompt(
                             install_plan
                                 .describe_uninstall(currently_explaining)
+                                .await
                                 .map_err(|e| eyre!(e))?,
                             PromptChoice::Yes,
                             currently_explaining,

diff --git a/src/cli/subcommand/uninstall.rs b/src/cli/subcommand/uninstall.rs
@@ -106,6 +106,7 @@ impl CommandExecute for Uninstall {
             loop {
                 match interaction::prompt(
                     plan.describe_uninstall(currently_explaining)
+                        .await
                         .map_err(|e| eyre!(e))?,
                     PromptChoice::Yes,
                     currently_explaining,

diff --git a/src/plan.rs b/src/plan.rs
@@ -90,24 +90,24 @@ impl InstallPlan {
         let buf = format!(
             "\
             Nix install plan (v{version})\n\
-            \n\
-            Planner: {planner}\n\
+            Planner: {planner}{maybe_default_setting_note}\n\
             \n\
             {maybe_plan_settings}\
-            \
-            The following actions will be taken:\n\
-            \n\
+            Planned actions:\n\
             {actions}\n\
         ",
             planner = planner.typetag_name(),
+            maybe_default_setting_note = if plan_settings.is_empty() {
+                String::from(" (with default settings)")
+            } else {
+                String::new()
+            },
             maybe_plan_settings = if plan_settings.is_empty() {
                 String::new()
             } else {
-                // TODO: "Changed planner settings"?
                 format!(
                     "\
-                    Planner settings:\n\
-                    \n\
+                    Configured settings:\n\
                     {plan_settings}\n\
                     \n\
                 ",
@@ -213,39 +213,56 @@ impl InstallPlan {
     }
 
     #[tracing::instrument(level = "debug", skip_all)]
-    pub fn describe_uninstall(&self, explain: bool) -> Result<String, NixInstallerError> {
+    pub async fn describe_uninstall(&self, explain: bool) -> Result<String, NixInstallerError> {
         let Self {
-            version: _,
+            version,
             planner,
             actions,
             ..
         } = self;
+
+        let plan_settings = if explain {
+            // List all settings when explaining
+            planner.settings()?
+        } else {
+            // Otherwise, only list user-configured settings
+            planner.configured_settings().await?
+        };
+        let mut plan_settings = plan_settings
+            .into_iter()
+            .map(|(k, v)| format!("* {k}: {v}", k = k.bold()))
+            .collect::<Vec<_>>();
+        // Stabilize output order
+        plan_settings.sort();
+
         let buf = format!(
             "\
-            Nix uninstall plan\n\
-            \n\
-            Planner: {planner}\n\
-            \n\
-            Planner settings:\n\
-            \n\
-            {plan_settings}\n\
+            Nix uninstall plan (v{version})\n\
             \n\
-            The following actions will be taken{maybe_explain}:\n\
+            Planner: {planner}{maybe_default_setting_note}\n\
             \n\
+            {maybe_plan_settings}\
+            Planned actions:\n\
             {actions}\n\
         ",
-            maybe_explain = if !explain {
-                " (`--explain` for more context)"
+            planner = planner.typetag_name(),
+            maybe_default_setting_note = if plan_settings.is_empty() {
+                String::from(" (with default settings)")
             } else {
-                ""
+                String::new()
+            },
+            maybe_plan_settings = if plan_settings.is_empty() {
+                String::new()
+            } else {
+                format!(
+                    "\
+                Configured settings:\n\
+                {plan_settings}\n\
+                \n\
+            ",
+                    plan_settings = plan_settings.join("\n")
+                )
             },
-            planner = planner.typetag_name(),
-            plan_settings = planner
-                .settings()?
-                .into_iter()
-                .map(|(k, v)| format!("* {k}: {v}", k = k.bold()))
-                .collect::<Vec<_>>()
-                .join("\n"),
             actions = actions
                 .iter()
                 .rev()