remove nix_shell_legacy

pkgs/clan-cli/clan_cli/machines/install.py

@@ -18,7 +18,7 @@ from clan_cli.errors import ClanError
 from clan_cli.facts.generate import generate_facts
 from clan_cli.machines.hardware import HardwareConfig
 from clan_cli.machines.machines import Machine
-from clan_cli.nix import nix_shell_legacy
+from clan_cli.nix import nix_shell
 from clan_cli.ssh.deploy_info import DeployInfo, find_reachable_host, ssh_command_parse
 from clan_cli.ssh.host_key import HostKeyCheck
 from clan_cli.vars.generate import generate_vars
@@ -145,24 +145,19 @@ def install_machine(opts: InstallOptions) -> None:
             # nix copy does not support tor socks proxy
             # cmd.append("--ssh-option")
             # cmd.append("ProxyCommand=nc -x 127.0.0.1:9050 -X 5 %h %p")
-            run(
-                nix_shell_legacy(
-                    [
-                        "nixpkgs#nixos-anywhere",
-                        "nixpkgs#tor",
-                    ],
-                    ["torify", *cmd],
-                ),
-                RunOpts(log=Log.BOTH, prefix=machine.name, needs_user_terminal=True),
+            cmd = nix_shell(
+                [
+                    "nixos-anywhere",
+                    "tor",
+                ],
+                ["torify", *cmd],
             )
         else:
-            run(
-                nix_shell_legacy(
-                    ["nixpkgs#nixos-anywhere"],
-                    cmd,
-                ),
-                RunOpts(log=Log.BOTH, prefix=machine.name, needs_user_terminal=True),
+            cmd = nix_shell(
+                ["nixos-anywhere"],
+                cmd,
             )
+        run(cmd, RunOpts(log=Log.BOTH, prefix=machine.name, needs_user_terminal=True))
 
 
 def install_command(args: argparse.Namespace) -> None:

pkgs/clan-cli/clan_cli/machines/list.py

@@ -20,7 +20,7 @@ from clan_cli.inventory import (
     patch_inventory_with,
 )
 from clan_cli.machines.hardware import HardwareConfig
-from clan_cli.nix import nix_eval, nix_shell_legacy
+from clan_cli.nix import nix_eval, nix_shell
 from clan_cli.tags import list_nixos_machines_by_tags
 
 log = logging.getLogger(__name__)
@@ -126,8 +126,8 @@ def check_machine_online(
 
     timeout = opts.timeout if opts and opts.timeout else 20
 
-    cmd = nix_shell_legacy(
-        ["nixpkgs#util-linux", *(["nixpkgs#openssh"] if hostname else [])],
+    cmd = nix_shell(
+        ["util-linux", *(["openssh"] if hostname else [])],
         [
             "ssh",
             *(["-i", f"{opts.keyfile}"] if opts and opts.keyfile else []),