Skip to content

various: cleanup #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotAShelf merged 2 commits into from
Sep 29, 2025
Merged

various: cleanup #422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71cd07a
nixos: simplify configuration switching
faukah Sep 18, 2025
40fe843
nixos: apply clippy hints
faukah Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 43 additions & 78 deletions src/nixos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,9 @@ impl OsRebuildArgs {
let toplevel = toplevel_for(
&target_hostname,
installable,
final_attr.unwrap_or(String::from("toplevel")).as_str(),
final_attr
.unwrap_or_else(|| String::from("toplevel"))
.as_str(),
);

let message = match variant {
Expand Down Expand Up @@ -208,10 +210,10 @@ impl OsRebuildArgs {

debug!("Target specialisation: {target_specialisation:?}");

let target_profile = match &target_specialisation {
None => out_path.clone(),
Some(spec) => out_path.join("specialisation").join(spec),
};
let target_profile = target_specialisation.as_ref().map_or_else(
|| out_path.clone(),
|spec| out_path.join("specialisation").join(spec),
);

debug!("Output path: {out_path:?}");
debug!("Target profile path: {}", target_profile.display());
Expand Down Expand Up @@ -290,31 +292,33 @@ impl OsRebuildArgs {
.run()?;
}

if let Test | Switch = variant {
let switch_to_configuration =
target_profile.join("bin").join("switch-to-configuration");

if !switch_to_configuration.exists() {
return Err(eyre!(
"The 'switch-to-configuration' binary is missing from the built \
configuration.\n\nThis typically happens when \
'system.switch.enable' is set to false in your\nNixOS \
configuration. To fix this, please either:\n1. Remove \
'system.switch.enable = false' from your configuration, or\n2. Set \
'system.switch.enable = true' explicitly\n\nIf the problem \
persists, please open an issue on our issue tracker!"
));
}
let switch_to_configuration = target_profile
.canonicalize()
.context("Failed to resolve output path")?
.join("bin")
.join("switch-to-configuration")
.canonicalize()
.context("Failed to resolve switch-to-configuration path")?;

if !switch_to_configuration.exists() {
return Err(eyre!(
"The 'switch-to-configuration' binary is missing from the built \
configuration.\n\nThis typically happens when 'system.switch.enable' \
is set to false in your\nNixOS configuration. To fix this, please \
either:\n1. Remove 'system.switch.enable = false' from your \
configuration, or\n2. Set 'system.switch.enable = true' \
explicitly\n\nIf the problem persists, please open an issue on our \
issue tracker!"
));
}

let switch_to_configuration = switch_to_configuration
.canonicalize()
.context("Failed to resolve switch-to-configuration path")?;
let switch_to_configuration =
switch_to_configuration.to_str().ok_or_else(|| {
eyre!("switch-to-configuration path contains invalid UTF-8")
})?;
let canonical_out_path =
switch_to_configuration.to_str().ok_or_else(|| {
eyre!("switch-to-configuration path contains invalid UTF-8")
})?;

Command::new(switch_to_configuration)
if let Test | Switch = variant {
Command::new(canonical_out_path)
.arg("test")
.ssh(self.target_host.clone())
.message("Activating configuration")
Expand All @@ -326,51 +330,14 @@ impl OsRebuildArgs {
}

if let Boot | Switch = variant {
let canonical_out_path = out_path
.canonicalize()
.context("Failed to resolve output path")?;

Command::new("nix")
.elevate(elevate.then_some(elevation.clone()))
.elevate(elevate.then_some(elevation))
.args(["build", "--no-link", "--profile", SYSTEM_PROFILE])
.arg(&canonical_out_path)
.ssh(self.target_host.clone())
.with_required_env()
.run()
.wrap_err("Failed to set system profile")?;

let switch_to_configuration =
out_path.join("bin").join("switch-to-configuration");

if !switch_to_configuration.exists() {
return Err(eyre!(
"The 'switch-to-configuration' binary is missing from the built \
configuration.\n\nThis typically happens when \
'system.switch.enable' is set to false in your\nNixOS \
configuration. To fix this, please either:\n1. Remove \
'system.switch.enable = false' from your configuration, or\n2. Set \
'system.switch.enable = true' explicitly\n\nIf the problem \
persists, please open an issue on our issue tracker!"
));
}

let switch_to_configuration = switch_to_configuration
.canonicalize()
.context("Failed to resolve switch-to-configuration path")?;
let switch_to_configuration =
switch_to_configuration.to_str().ok_or_else(|| {
eyre!("switch-to-configuration path contains invalid UTF-8")
})?;

Command::new(switch_to_configuration)
.arg("boot")
.arg(canonical_out_path)
.ssh(self.target_host)
.elevate(elevate.then_some(elevation))
.message("Adding configuration to bootloader")
.preserve_envs(["NIXOS_INSTALL_BOOTLOADER"])
.with_required_env()
.run()
.wrap_err("Bootloader activation failed")?;
.wrap_err("Failed to set system profile")?;
}

debug!("Completed operation with output path: {out_path:?}");
Expand All @@ -380,6 +347,7 @@ impl OsRebuildArgs {
}

impl OsRollbackArgs {
#[expect(clippy::too_many_lines)]
fn rollback(&self, elevation: ElevationStrategy) -> Result<()> {
let elevate = if self.bypass_root_check {
warn!("Bypassing root check, now running nix as root");
Expand Down Expand Up @@ -560,7 +528,7 @@ fn find_previous_generation() -> Result<generations::GenerationInfo> {
let mut generations: Vec<generations::GenerationInfo> = fs::read_dir(
profile_path
.parent()
.unwrap_or(Path::new("/nix/var/nix/profiles")),
.unwrap_or_else(|| Path::new("/nix/var/nix/profiles")),
)?
.filter_map(|entry| {
entry.ok().and_then(|e| {
Expand Down Expand Up @@ -608,7 +576,7 @@ fn find_generation_by_number(
let generations: Vec<generations::GenerationInfo> = fs::read_dir(
profile_path
.parent()
.unwrap_or(Path::new("/nix/var/nix/profiles")),
.unwrap_or_else(|| Path::new("/nix/var/nix/profiles")),
)?
.filter_map(|entry| {
entry.ok().and_then(|e| {
Expand Down Expand Up @@ -639,7 +607,7 @@ fn get_current_generation_number() -> Result<u64> {
let generations: Vec<generations::GenerationInfo> = fs::read_dir(
profile_path
.parent()
.unwrap_or(Path::new("/nix/var/nix/profiles")),
.unwrap_or_else(|| Path::new("/nix/var/nix/profiles")),
)?
.filter_map(|entry| entry.ok().and_then(|e| generations::describe(&e.path())))
.collect();
Expand Down Expand Up @@ -693,14 +661,11 @@ pub fn toplevel_for<S: AsRef<str>>(
},
Installable::File {
ref mut attribute, ..
} => {
attribute.extend(toplevel);
},
Installable::Expression {
}
| Installable::Expression {
ref mut attribute, ..
} => {
attribute.extend(toplevel);
},
} => attribute.extend(toplevel),

Installable::Store { .. } => {},
}

Expand Down