Skip to content

fix: flakes support on disko standalone cli #1077

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: flakes support on disko standalone cli #1077

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions cli.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ let

hasDiskoFile = diskoFile != null;

hasDiskoConfigFlake =
hasDiskoFile || lib.hasAttrByPath [ "diskoConfigurations" flakeAttr ] (builtins.getFlake flake);

diskoAttr =
(
if noDeps then
(
if hasDiskoFile then
if hasDiskoFile || hasDiskoConfigFlake then
{
destroy = "_cliDestroyNoDeps";
format = "_cliFormatNoDeps";
Expand Down Expand Up @@ -50,7 +53,7 @@ let
}
else
(
if hasDiskoFile then
if hasDiskoFile || hasDiskoConfigFlake then
{
destroy = "_cliDestroy";
format = "_cliFormat";
Expand Down Expand Up @@ -79,9 +82,6 @@ let
}
).${mode};

hasDiskoConfigFlake =
hasDiskoFile || lib.hasAttrByPath [ "diskoConfigurations" flakeAttr ] (builtins.getFlake flake);

hasDiskoModuleFlake = lib.hasAttrByPath [
"nixosConfigurations"
flakeAttr
Expand Down