From e7dcabc5c471eca8c93e35096264af22759389df Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:37:22 +1100
Subject: [PATCH] clan-cli: don't list non-Clan NixOS configurations

---
 pkgs/clan-cli/clan_cli/completions.py   | 2 +-
 pkgs/clan-cli/clan_cli/machines/list.py | 2 +-
 pkgs/clan-cli/default.nix               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/completions.py b/pkgs/clan-cli/clan_cli/completions.py
index 3bb145d21..a9efb4c46 100644
--- a/pkgs/clan-cli/clan_cli/completions.py
+++ b/pkgs/clan-cli/clan_cli/completions.py
@@ -51,7 +51,7 @@ def complete_machines(
                 run(
                     nix_eval(
                         flags=[
-                            f"{flake}#nixosConfigurations",
+                            f"{flake}#clanInternals.machines.x86_64-linux",
                             "--apply",
                             "builtins.attrNames",
                         ],
diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py
index 677c6d061..a41709e10 100644
--- a/pkgs/clan-cli/clan_cli/machines/list.py
+++ b/pkgs/clan-cli/clan_cli/machines/list.py
@@ -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]:
     cmd = nix_eval(
         [
-            f"{flake_url}#nixosConfigurations",
+            f"{flake_url}#clanInternals.machines.x86_64-linux",
             "--apply",
             "builtins.attrNames",
             "--json",
diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index da9596d43..3ff032641 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -195,7 +195,7 @@ python3.pkgs.buildPythonApplication {
     installShellCompletion --fish --name clan.fish \
       <(${argcomplete}/bin/register-python-argcomplete --shell fish 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