From 660dafd412bc6a0242e939ee7a45acc442306800 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 22 Sep 2023 14:38:23 +0200 Subject: [PATCH] config: read nixos option correctly --- pkgs/clan-cli/clan_cli/config/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/config/__init__.py b/pkgs/clan-cli/clan_cli/config/__init__.py index dcb53c4..b568a34 100644 --- a/pkgs/clan-cli/clan_cli/config/__init__.py +++ b/pkgs/clan-cli/clan_cli/config/__init__.py @@ -118,15 +118,14 @@ def options_for_machine(machine_name: str) -> dict: def read_machine_option_value(machine_name: str, option: str) -> str: + clan_dir = get_clan_flake_toplevel() # use nix eval to read from .#nixosConfigurations.default.config.{option} # this will give us the evaluated config with the options attribute proc = subprocess.run( nix_eval( flags=[ "--show-trace", - "--extra-experimental-features", - "nix-command flakes", - f".#nixosConfigurations.{machine_name}.config.{option}", + f"{clan_dir}#nixosConfigurations.{machine_name}.config.{option}", ], ), capture_output=True,