IoSL/service-aware-frontend
3
0
Fork 0
generated from Luis/nextjs-python-web-template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clan-config: fix: read options from nixosConfigurations instead of nixosModules

Browse Source
This commit is contained in:
DavHau
2023-09-02 16:35:59 +02:00
parent b8892c6826
commit a1d825d0a0
3 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/clan-cli/clan_cli/config/__init__.py
View File

@@ -108,18 +108,15 @@ def options_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict
let
flake = builtins.getFlake (toString {flake});
lib = flake.inputs.nixpkgs.lib;
module = flake.nixosModules.machine-{machine_name};
evaled = lib.evalModules {{
modules = [module];
}};
options = flake.nixosConfigurations.{machine_name}.options;
# this is actually system independent as it uses toFile
docs = flake.inputs.nixpkgs.legacyPackages.x86_64-linux.nixosOptionsDoc {{
inherit (evaled) options;
inherit options;
}};
options = builtins.fromJSON (builtins.readFile docs.optionsJSON.options);
opts = builtins.fromJSON (builtins.readFile docs.optionsJSON.options);
in
options
opts
""",
],
),