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

clan-cli: don't list non-Clan NixOS configurations

Browse Source
This commit is contained in:
Michael Hoang
2024-12-17 14:37:22 +11:00
parent 1b5cb6a5b4
commit e7dcabc5c4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/completions.py
View File

@@ -51,7 +51,7 @@ def complete_machines(
run( run(
nix_eval( nix_eval(
flags=[ flags=[
f"{flake}#nixosConfigurations", f"{flake}#clanInternals.machines.x86_64-linux",
"--apply", "--apply",
"builtins.attrNames", "builtins.attrNames",
], ],

2
pkgs/clan-cli/clan_cli/machines/list.py
View File

@@ -85,7 +85,7 @@ def get_inventory_machine_details(flake_url: Path, machine_name: str) -> Machine
def list_nixos_machines(flake_url: str | Path) -> list[str]: def list_nixos_machines(flake_url: str | Path) -> list[str]:
cmd = nix_eval( cmd = nix_eval(
[ [
f"{flake_url}#nixosConfigurations", f"{flake_url}#clanInternals.machines.x86_64-linux",
"--apply", "--apply",
"builtins.attrNames", "builtins.attrNames",
"--json", "--json",

2
pkgs/clan-cli/default.nix
View File

@@ -195,7 +195,7 @@ python3.pkgs.buildPythonApplication {
installShellCompletion --fish --name clan.fish \ installShellCompletion --fish --name clan.fish \
<(${argcomplete}/bin/register-python-argcomplete --shell fish clan) <(${argcomplete}/bin/register-python-argcomplete --shell fish clan)
installShellCompletion --zsh --name _clan \ installShellCompletion --zsh --name _clan \
<(${argcomplete}/bin/register-python-argcomplete --shell bash clan) <(${argcomplete}/bin/register-python-argcomplete --shell zsh clan)
''; '';
# Clean up after the package to avoid leaking python packages into a devshell # Clean up after the package to avoid leaking python packages into a devshell