feat: add notification support to --ask flags

Change-Id: I6a6a69642ac3443525df583fd200827414801d41

Author: r0chd

Cargo.toml

@@ -38,8 +38,8 @@ hostname = "0.4.1"
 humantime = "2.3.0"
 inquire = { default-features = false, version = "0.9.1", features = [ "crossterm" ] }
 nix = { default-features = false, features = [ "fs", "user" ], version = "0.30.1" }
-regex = "1.11.3"
 notify-rust = "4.11.7"
+regex = "1.11.3"
 reqwest = { default-features = false, features = [
   "rustls-tls-native-roots",
   "blocking",

src/clean.rs

@@ -20,8 +20,9 @@ use yansi::{Color, Paint};
 use crate::{
   Result,
   commands::{Command, ElevationStrategy},
-  interface,
+  interface::{self, NotifyAskMode},
   nh_info,
+  notify::NotificationSender,
 };
 
 // Nix impl:
@@ -250,7 +251,7 @@ impl interface::CleanMode {
             Err(err) => {
               warn!(?err, ?now, "Failed to compare time!");
             },
-            Ok(val) if val <= args.keep_since.into() => {
+            Ok(val) if val <= std::time::Duration::from(args.keep_since) => {
               gcroots_tagged.insert(dst, false);
             },
             Ok(_) => {
@@ -334,12 +335,26 @@ impl interface::CleanMode {
     }
 
     // Clean the paths
-    if args.ask
-      && !Confirm::new("Confirm the cleanup plan?")
-        .with_default(false)
-        .prompt()?
-    {
-      bail!("User rejected the cleanup plan");
+    if let Some(ask) = &args.ask {
+      let confirmation = match ask {
+        NotifyAskMode::Prompt => {
+          Confirm::new("Confirm the cleanup plan?")
+            .with_default(false)
+            .prompt()?
+        },
+        #[cfg(all(unix, not(target_os = "macos")))]
+        NotifyAskMode::Notify => {
+          NotificationSender::new(
+            "nh clean",
+            "Do you want to confirm the cleanup plan?",
+          )
+          .ask()
+        },
+      };
+
+      if !confirmation {
+        bail!("User rejected the cleanup plan");
+      }
     }
 
     if !args.dry {
@@ -489,7 +504,7 @@ fn cleanable_generations(
       Err(err) => {
         warn!(?err, ?now, ?generation, "Failed to compare time!");
       },
-      Ok(val) if val <= keep_since.into() => {
+      Ok(val) if val <= std::time::Duration::from(keep_since) => {
         *tbr = false;
       },
       Ok(_) => {},

src/darwin.rs

@@ -1,4 +1,4 @@
-use std::{env, path::PathBuf};
+use std::{env, fmt, path::PathBuf};
 
 use color_eyre::eyre::{Context, bail, eyre};
 use tracing::{debug, warn};
@@ -14,8 +14,10 @@ use crate::{
     DarwinReplArgs,
     DarwinSubcommand,
     DiffType,
+    NotifyAskMode,
   },
   nixos::toplevel_for,
+  notify::NotificationSender,
   update::update,
   util::{get_hostname, print_dix_diff},
 };
@@ -34,7 +36,7 @@ impl DarwinArgs {
     match self.subcommand {
       DarwinSubcommand::Switch(args) => args.rebuild(&Switch, elevation),
       DarwinSubcommand::Build(args) => {
-        if args.common.ask || args.common.dry {
+        if args.common.ask.is_some() || args.common.dry {
           warn!("`--ask` and `--dry` have no effect for `nh darwin build`");
         }
         args.rebuild(&Build, elevation)
@@ -49,6 +51,16 @@ enum DarwinRebuildVariant {
   Build,
 }
 
+impl fmt::Display for DarwinRebuildVariant {
+  fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    let s = match self {
+      DarwinRebuildVariant::Build => "build",
+      DarwinRebuildVariant::Switch => "switch",
+    };
+    write!(f, "{s}")
+  }
+}
+
 impl DarwinRebuildArgs {
   fn rebuild(
     self,
@@ -144,13 +156,27 @@ impl DarwinRebuildArgs {
       let _ = print_dix_diff(&PathBuf::from(CURRENT_PROFILE), &target_profile);
     }
 
-    if self.common.ask && !self.common.dry && !matches!(variant, Build) {
-      let confirmation = inquire::Confirm::new("Apply the config?")
-        .with_default(false)
-        .prompt()?;
+    if !self.common.dry && !matches!(variant, Build) {
+      if let Some(ask) = self.common.ask {
+        let confirmation = match ask {
+          NotifyAskMode::Prompt => {
+            inquire::Confirm::new("Apply the config?")
+              .with_default(false)
+              .prompt()?
+          },
+          #[cfg(all(unix, not(target_os = "macos")))]
+          NotifyAskMode::Notify => {
+            NotificationSender::new(
+              &format!("nh darwin {variant}"),
+              "Do you want to apply the Darwin configuration?",
+            )
+            .ask()
+          },
+        };
 
-      if !confirmation {
-        bail!("User rejected the new config");
+        if !confirmation {
+          bail!("User rejected the new config");
+        }
       }
     }
 

src/home.rs

@@ -10,8 +10,16 @@ use crate::{
   commands,
   commands::Command,
   installable::Installable,
-  interface::{self, DiffType, HomeRebuildArgs, HomeReplArgs, HomeSubcommand},
+  interface::{
+    self,
+    DiffType,
+    HomeRebuildArgs,
+    HomeReplArgs,
+    HomeSubcommand,
+    NotifyAskMode,
+  },
   nh_info,
+  notify::NotificationSender,
   update::update,
   util::{get_hostname, print_dix_diff},
 };
@@ -27,7 +35,7 @@ impl interface::HomeArgs {
     match self.subcommand {
       HomeSubcommand::Switch(args) => args.rebuild(&Switch),
       HomeSubcommand::Build(args) => {
-        if args.common.ask || args.common.dry {
+        if args.common.ask.is_some() || args.common.dry {
           warn!("`--ask` and `--dry` have no effect for `nh home build`");
         }
         args.rebuild(&Build)
@@ -151,16 +159,28 @@ impl HomeRebuildArgs {
     }
 
     if self.common.dry || matches!(variant, Build) {
-      if self.common.ask {
+      if self.common.ask.is_some() {
         warn!("--ask has no effect as dry run was requested");
       }
       return Ok(());
     }
 
-    if self.common.ask {
-      let confirmation = inquire::Confirm::new("Apply the config?")
-        .with_default(false)
-        .prompt()?;
+    if let Some(ask) = &self.common.ask {
+      let confirmation = match ask {
+        NotifyAskMode::Prompt => {
+          inquire::Confirm::new("Apply the config?")
+            .with_default(false)
+            .prompt()?
+        },
+        #[cfg(all(unix, not(target_os = "macos")))]
+        NotifyAskMode::Notify => {
+          NotificationSender::new(
+            "nh home switch",
+            "Do you want to apply the Home Manager configuration?",
+          )
+          .ask()
+        },
+      };
 
       if !confirmation {
         bail!("User rejected the new config");

src/interface.rs

@@ -264,15 +264,24 @@ pub enum DiffType {
   Never,
 }
 
+#[derive(Debug, Clone, ValueEnum, PartialEq)]
+pub enum NotifyAskMode {
+  /// Ask in the terminal (stdin prompt)
+  Prompt,
+  /// Ask via a desktop notification action
+  #[cfg(all(unix, not(target_os = "macos")))]
+  Notify,
+}
+
 #[derive(Debug, Args)]
 pub struct OsRollbackArgs {
   /// Only print actions, without performing them
   #[arg(long, short = 'n')]
   pub dry: bool,
 
   /// Ask for confirmation
-  #[arg(long, short)]
-  pub ask: bool,
+  #[arg(long, short, value_enum, default_missing_value = "prompt", num_args = 0..=1)]
+  pub ask: Option<NotifyAskMode>,
 
   /// Explicitly select some specialisation
   #[arg(long, short)]
@@ -303,8 +312,8 @@ pub struct CommonRebuildArgs {
   pub dry: bool,
 
   /// Ask for confirmation
-  #[arg(long, short)]
-  pub ask: bool,
+  #[arg(long, short, default_missing_value = "prompt", num_args = 0..=1)]
+  pub ask: Option<NotifyAskMode>,
 
   #[command(flatten)]
   pub installable: Installable,
@@ -435,8 +444,8 @@ pub struct CleanArgs {
   pub dry: bool,
 
   /// Ask for confirmation
-  #[arg(long, short)]
-  pub ask: bool,
+  #[arg(long, short, default_missing_value = "prompt", num_args = 0..=1)]
+  pub ask: Option<NotifyAskMode>,
 
   /// Don't run nix store --gc
   #[arg(long = "no-gc", alias = "nogc")]

src/logging.rs

@@ -31,15 +31,15 @@ where
 
     match *level {
       Level::ERROR => {
-        write!(writer, "{} ", Paint::new("ERROR").fg(Color::Red))?
+        write!(writer, "{} ", Paint::new("ERROR").fg(Color::Red))?;
       },
       Level::WARN => write!(writer, "{} ", Paint::new("!").fg(Color::Yellow))?,
       Level::INFO => write!(writer, "{} ", Paint::new(">").fg(Color::Green))?,
       Level::DEBUG => {
-        write!(writer, "{} ", Paint::new("DEBUG").fg(Color::Blue))?
+        write!(writer, "{} ", Paint::new("DEBUG").fg(Color::Blue))?;
       },
       Level::TRACE => {
-        write!(writer, "{} ", Paint::new("TRACE").fg(Color::Cyan))?
+        write!(writer, "{} ", Paint::new("TRACE").fg(Color::Cyan))?;
       },
     }
 
@@ -99,7 +99,7 @@ pub fn setup_logging(
 macro_rules! nh_info {
     ($($arg:tt)*) => {{
         use notify_rust::Urgency;
-        use crate::notify::NotificationSender;
+        use $crate::notify::NotificationSender;
         let message = format!($($arg)*);
         tracing::info!($($arg)*);
         NotificationSender::new("nh info", &message).urgency(Urgency::Normal).send().unwrap();
@@ -110,7 +110,7 @@ macro_rules! nh_info {
 macro_rules! nh_warn {
     ($($arg:tt)*) => {{
         use notify_rust::Urgency;
-        use crate::notify::NotificationSender;
+        use $crate::notify::NotificationSender;
         let message = format!($($arg)*);
         tracing::warn!($($arg)*);
         NotificationSender::new("nh warn", &message).urgency(Urgency::Normal).send().unwrap();

src/nixos.rs

@@ -14,6 +14,7 @@ use crate::{
   interface::{
     self,
     DiffType,
+    NotifyAskMode,
     OsBuildVmArgs,
     OsGenerationsArgs,
     OsRebuildArgs,
@@ -22,6 +23,7 @@ use crate::{
     OsSubcommand::{self},
   },
   nh_info,
+  notify::NotificationSender,
   update::update,
   util::{ensure_ssh_key_login, get_hostname, print_dix_diff},
 };
@@ -39,7 +41,7 @@ impl interface::OsArgs {
       OsSubcommand::Test(args) => args.rebuild(&Test, None, elevation),
       OsSubcommand::Switch(args) => args.rebuild(&Switch, None, elevation),
       OsSubcommand::Build(args) => {
-        if args.common.ask || args.common.dry {
+        if args.common.ask.is_some() || args.common.dry {
           warn!("`--ask` and `--dry` have no effect for `nh os build`");
         }
         args.rebuild(&Build, None, elevation)
@@ -132,7 +134,7 @@ impl OsRebuildArgs {
     self.handle_dix_diff(&target_profile);
 
     if self.common.dry || matches!(variant, Build | BuildVm) {
-      if self.common.ask {
+      if self.common.ask.is_some() {
         warn!("--ask has no effect as dry run was requested");
       }
 
@@ -317,10 +319,22 @@ impl OsRebuildArgs {
   ) -> Result<()> {
     use OsRebuildVariant::{Boot, Switch, Test};
 
-    if self.common.ask {
-      let confirmation = inquire::Confirm::new("Apply the config?")
-        .with_default(false)
-        .prompt()?;
+    if let Some(ask) = &self.common.ask {
+      let confirmation = match ask {
+        NotifyAskMode::Prompt => {
+          inquire::Confirm::new("Apply the config?")
+            .with_default(false)
+            .prompt()?
+        },
+        #[cfg(all(unix, not(target_os = "macos")))]
+        NotifyAskMode::Notify => {
+          NotificationSender::new(
+            "nh os switch",
+            "Do you want to apply the NixOS configuration?",
+          )
+          .ask()
+        },
+      };
 
       if !confirmation {
         bail!("User rejected the new config");
@@ -465,13 +479,25 @@ impl OsRollbackArgs {
       return Ok(());
     }
 
-    if self.ask {
-      let confirmation = inquire::Confirm::new(&format!(
-        "Roll back to generation {}?",
-        target_generation.number
-      ))
-      .with_default(false)
-      .prompt()?;
+    if let Some(ask) = &self.ask {
+      let confirmation = match ask {
+        NotifyAskMode::Prompt => {
+          inquire::Confirm::new(&format!(
+            "Roll back to generation {}?",
+            target_generation.number
+          ))
+          .with_default(false)
+          .prompt()?
+        },
+        #[cfg(all(unix, not(target_os = "macos")))]
+        NotifyAskMode::Notify => {
+          NotificationSender::new(
+            "nh os rollback",
+            &format!("Roll back to generation {}?", target_generation.number),
+          )
+          .ask()
+        },
+      };
 
       if !confirmation {
         bail!("User rejected the rollback");
@@ -659,7 +685,7 @@ fn print_vm_instructions(out_path: &Path) {
   }
 }
 
-/// Runs the built NixOS VM by executing the VM runner script.
+/// Runs the built `NixOS` VM by executing the VM runner script.
 ///
 /// Locates the VM runner script in the build output directory and executes it,
 /// streaming its output to the user. Returns an error if the script cannot be