yadunut/clan-core
1
0
Fork 0
Code Issues 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
""",
],
),

14
pkgs/clan-cli/clan_cli/config/machine.py
View File

@@ -8,6 +8,7 @@ from fastapi import HTTPException
from clan_cli.dirs import get_clan_flake_toplevel, nixpkgs
from clan_cli.machines.folders import machine_folder, machine_settings_file
from clan_cli.nix import nix_eval
def config_for_machine(machine_name: str) -> dict:
@@ -42,9 +43,8 @@ def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
flake = get_clan_flake_toplevel()
# use nix eval to lib.evalModules .#nixosModules.machine-{machine_name}
proc = subprocess.run(
[
"nix",
"eval",
nix_eval(
flags=[
"--json",
"--impure",
"--show-trace",
@@ -55,17 +55,15 @@ def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
let
flake = builtins.getFlake (toString {flake});
lib = import {nixpkgs()}/lib;
module = flake.nixosModules.machine-{machine_name};
evaled = lib.evalModules {{
modules = [module];
}};
clanOptions = evaled.options.clan;
options = flake.nixosConfigurations.{machine_name}.options;
clanOptions = options.clan;
jsonschemaLib = import {Path(__file__).parent / "jsonschema"} {{ inherit lib; }};
jsonschema = jsonschemaLib.parseOptions clanOptions;
in
jsonschema
""",
],
),
capture_output=True,
text=True,
)

7
pkgs/clan-cli/tests/machine_flake/flake.nix
View File

@@ -5,11 +5,12 @@
};
outputs = inputs: {
nixosModules.machine-machine1 = ./nixosModules/machine1.nix;
nixosConfigurations.machine1 = inputs.nixpkgs.lib.nixosSystem {
modules = [
inputs.self.nixosModules.machine-machine1
(builtins.fromJSON (builtins.readFile ./machines/machine1.json))
./nixosModules/machine1.nix
(if builtins.pathExists ./machines/machine1.json
then builtins.fromJSON (builtins.readFile ./machines/machine1.json)
else { })
{ nixpkgs.hostPlatform = "x86_64-linux"; }
];
};