yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove machine settings.json

Browse Source
This commit is contained in:
Jörg Thalheim
2024-10-09 11:49:44 +02:00
parent 5462ff7e50
commit ff4ae1eb50
3 changed files with 2 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/clan-cli/clan_cli/dirs.py
View File

@@ -115,10 +115,6 @@ def specific_machine_dir(flake_dir: Path, machine: str) -> Path:
return machines_dir(flake_dir) / machine
def machine_settings_file(flake_dir: Path, machine: str) -> Path:
return specific_machine_dir(flake_dir, machine) / "settings.json"
def module_root() -> Path:
return Path(__file__).parent

14
pkgs/clan-cli/tests/test_flake/flake.nix
View File

@@ -12,23 +12,11 @@
inputs = inputs' // {
clan-core = fake-clan-core;
};
machineSettings = (
if builtins.getEnv "CLAN_MACHINE_SETTINGS_FILE" != "" then
builtins.fromJSON (builtins.readFile (builtins.getEnv "CLAN_MACHINE_SETTINGS_FILE"))
else if builtins.pathExists ./machines/machine1/settings.json then
builtins.fromJSON (builtins.readFile ./machines/machine1/settings.json)
else
{ }
);
machineImports = map (module: fake-clan-core.clanModules.${module}) (
machineSettings.clanImports or [ ]
);
in
{
nixosConfigurations.machine1 = inputs.nixpkgs.lib.nixosSystem {
modules = machineImports ++ [
modules = [
./nixosModules/machine1.nix
machineSettings
(
{
lib,