various: system notifications

Cargo.toml

@@ -38,6 +38,7 @@ 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" }
+notify-rust = "4.11.7"
 regex = "1.11.3"
 reqwest = { default-features = false, features = [
   "rustls-tls-native-roots",

src/clean.rs

@@ -14,13 +14,15 @@ use nix::{
   unistd::{AccessFlags, faccessat},
 };
 use regex::Regex;
-use tracing::{Level, debug, info, instrument, span, warn};
+use tracing::{Level, debug, instrument, span, warn};
 use yansi::{Color, Paint};
 
 use crate::{
   Result,
   commands::{Command, ElevationStrategy},
-  interface,
+  interface::{self, NotifyAskMode},
+  nh_info,
+  notify::NotificationSender,
 };
 
 // Nix impl:
@@ -249,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(_) => {
@@ -333,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 {
@@ -488,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(_) => {},
@@ -504,7 +520,7 @@ fn cleanable_generations(
 }
 
 fn remove_path_nofail(path: &Path) {
-  info!("Removing {}", path.to_string_lossy());
+  nh_info!("Removing {}", path.to_string_lossy());
   if let Err(err) = std::fs::remove_file(path) {
     warn!(?path, ?err, "Failed to remove path");
   }

src/commands.rs

@@ -12,10 +12,14 @@ use color_eyre::{
 use secrecy::{ExposeSecret, SecretString};
 use subprocess::{Exec, ExitStatus, Redirection};
 use thiserror::Error;
-use tracing::{debug, info, warn};
+use tracing::{debug, warn};
 use which::which;
 
-use crate::{installable::Installable, interface::NixBuildPassthroughArgs};
+use crate::{
+  installable::Installable,
+  interface::NixBuildPassthroughArgs,
+  nh_info,
+};
 
 static PASSWORD_CACHE: OnceLock<Mutex<HashMap<String, SecretString>>> =
   OnceLock::new();
@@ -539,7 +543,7 @@ impl Command {
     );
 
     if let Some(m) = &self.message {
-      info!("{m}");
+      nh_info!("{m}");
     }
 
     debug!(?cmd);
@@ -589,7 +593,7 @@ impl Command {
     );
 
     if let Some(m) = &self.message {
-      info!("{m}");
+      nh_info!("{m}");
     }
 
     debug!(?cmd);
@@ -670,7 +674,7 @@ impl Build {
   /// Returns an error if the build command fails to execute.
   pub fn run(&self) -> Result<()> {
     if let Some(m) = &self.message {
-      info!("{m}");
+      nh_info!("{m}");
     }
 
     let installable_args = self.installable.to_args();

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

@@ -4,13 +4,22 @@ use color_eyre::{
   Result,
   eyre::{Context, bail, eyre},
 };
-use tracing::{debug, info, warn};
+use tracing::{debug, warn};
 
 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},
 };
@@ -26,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)
@@ -150,24 +159,36 @@ 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");
       }
     }
 
     if let Some(ext) = &self.backup_extension {
-      info!("Using {} as the backup extension", ext);
+      nh_info!("Using {} as the backup extension", ext);
       unsafe {
         env::set_var("HOME_MANAGER_BACKUP_EXT", ext);
       }

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/lib.rs

@@ -11,6 +11,7 @@ pub mod interface;
 pub mod json;
 pub mod logging;
 pub mod nixos;
+pub mod notify;
 pub mod search;
 pub mod update;
 pub mod util;

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))?;
       },
     }
 
@@ -94,3 +94,29 @@ pub fn setup_logging(
 
   Ok(())
 }
+
+#[macro_export]
+macro_rules! nh_info {
+    ($($arg:tt)*) => {{
+        use notify_rust::Urgency;
+        use $crate::notify::NotificationSender;
+        let message = format!($($arg)*);
+        tracing::info!($($arg)*);
+        if let Err(e) = NotificationSender::new("nh info", &message).urgency(Urgency::Normal).send() {
+          tracing::error!("{e}");
+        };
+    }};
+}
+
+#[macro_export]
+macro_rules! nh_warn {
+    ($($arg:tt)*) => {{
+        use notify_rust::Urgency;
+        use $crate::notify::NotificationSender;
+        let message = format!($($arg)*);
+        tracing::warn!($($arg)*);
+        if let Err(e) = NotificationSender::new("nh warn", &message).urgency(Urgency::Normal).send() {
+          tracing::error!("{e}");
+        };
+    }};
+}

src/main.rs

@@ -10,6 +10,7 @@ mod interface;
 mod json;
 mod logging;
 mod nixos;
+mod notify;
 mod search;
 mod update;
 mod util;