various: propagate --profile to relevant subcommands

Signed-off-by: NotAShelf <[email protected]>
Change-Id: I6a6a69646f8083bc0869647ef1e8130b9497f545

Author: NotAShelf

src/darwin.rs

@@ -23,6 +23,23 @@ use crate::{
 const SYSTEM_PROFILE: &str = "/nix/var/nix/profiles/system";
 const CURRENT_PROFILE: &str = "/run/current-system";
 
+fn get_system_profile(
+  profile: &Option<std::path::PathBuf>,
+) -> &std::ffi::OsStr {
+  profile
+    .as_ref().map_or_else(|| std::ffi::OsStr::new(SYSTEM_PROFILE), |p| p.as_os_str())
+}
+
+fn get_current_profile_pathbuf(
+  profile: &Option<std::path::PathBuf>,
+) -> PathBuf {
+  // XXX: For Darwin, `CURRENT_PROFILE` is only used for diffing, so fallback to
+  // default if not set
+  profile
+    .clone()
+    .unwrap_or_else(|| PathBuf::from(CURRENT_PROFILE))
+}
+
 impl DarwinArgs {
   /// Run the `darwin` subcommand.
   ///
@@ -150,7 +167,10 @@ impl DarwinRebuildArgs {
         "Comparing with target profile: {}",
         target_profile.display()
       );
-      let _ = print_dix_diff(&PathBuf::from(CURRENT_PROFILE), &target_profile);
+      let _ = print_dix_diff(
+        &get_current_profile_pathbuf(&self.profile),
+        &target_profile,
+      );
     }
 
     if self.common.ask && !self.common.dry && !matches!(variant, Build) {
@@ -164,11 +184,7 @@ impl DarwinRebuildArgs {
     }
 
     if matches!(variant, Switch) {
-      let profile_path = if let Some(profile) = self.profile.as_ref() {
-        profile.as_os_str()
-      } else {
-        std::ffi::OsStr::new(SYSTEM_PROFILE)
-      };
+      let profile_path = get_system_profile(&self.profile);
       Command::new("nix")
         .args(["build", "--no-link", "--profile"])
         .arg(profile_path)

src/home.rs

@@ -110,25 +110,28 @@ impl HomeRebuildArgs {
         );
       }
     }
-    let prev_generation: Option<PathBuf> =
-      if let Some(ref profile) = self.profile {
-        if profile.exists() {
-          Some(profile.clone())
-        } else {
-          None
-        }
+    let profile_path = if let Some(ref profile) = self.profile {
+      profile.clone()
+    } else {
+      let user_profile = PathBuf::from(USER_PROFILE_PATH)
+        .join(env::var("USER").map_err(|_| eyre!("Couldn't get username"))?)
+        .join("home-manager");
+      let home_profile = PathBuf::from(
+        env::var("HOME").map_err(|_| eyre!("Couldn't get home directory"))?,
+      )
+      .join(HOME_PROFILE_PATH);
+      if user_profile.exists() {
+        user_profile
       } else {
-        let user_profile = PathBuf::from(USER_PROFILE_PATH)
-          .join(env::var("USER").map_err(|_| eyre!("Couldn't get username"))?)
-          .join("home-manager");
-        let home_profile = PathBuf::from(
-          env::var("HOME").map_err(|_| eyre!("Couldn't get home directory"))?,
-        )
-        .join(HOME_PROFILE_PATH);
-        [user_profile, home_profile]
-          .into_iter()
-          .find(|next| next.exists())
-      };
+        home_profile
+      }
+    };
+
+    let prev_generation: Option<PathBuf> = if profile_path.exists() {
+      Some(profile_path.clone())
+    } else {
+      None
+    };
 
     debug!("Previous generation: {prev_generation:?}");
 

src/nixos.rs

@@ -238,8 +238,13 @@ impl OsRebuildArgs {
 
     match self.common.diff {
       DiffType::Always => {
-        let _ =
-          print_dix_diff(&PathBuf::from(CURRENT_PROFILE), &target_profile);
+        let _ = print_dix_diff(
+          &self.profile.as_ref().map_or_else(
+            || PathBuf::from(CURRENT_PROFILE),
+            PathBuf::from,
+          ),
+          &target_profile,
+        );
       },
       DiffType::Never => {
         debug!("Not running dix as the --diff flag is set to never.");
@@ -253,8 +258,13 @@ impl OsRebuildArgs {
             "Comparing with target profile: {}",
             target_profile.display()
           );
-          let _ =
-            print_dix_diff(&PathBuf::from(CURRENT_PROFILE), &target_profile);
+          let _ = print_dix_diff(
+            &self.profile.as_ref().map_or_else(
+              || PathBuf::from(CURRENT_PROFILE),
+              PathBuf::from,
+            ),
+            &target_profile,
+          );
         } else {
           debug!(
             "Not running dix as the target hostname is different from the \
@@ -452,7 +462,13 @@ impl OsRollbackArgs {
         "Comparing with target profile: {}",
         generation_link.display()
       );
-      let _ = print_dix_diff(&PathBuf::from(CURRENT_PROFILE), &generation_link);
+      let _ = print_dix_diff(
+        &self
+          .profile
+          .as_ref()
+          .map_or_else(|| PathBuf::from(CURRENT_PROFILE), PathBuf::from),
+        &generation_link,
+      );
     }
 
     if self.dry {