From ffb0c2717e92fa758dcc828cb28cd9e6305d5397 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Wed, 25 Jun 2025 18:18:59 +0200
Subject: [PATCH] Fix user field in tailscale scp

---
 tree/.local/nu/tailscale.nu | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tree/.local/nu/tailscale.nu b/tree/.local/nu/tailscale.nu
index beb4a0f..3d74116 100644
--- a/tree/.local/nu/tailscale.nu
+++ b/tree/.local/nu/tailscale.nu
@@ -36,12 +36,8 @@ def "tailscale ssh" [
 	user_hostname: string
 	...ssh_flags: string
 ]: nothing -> any {
-	if "@" in $user_hostname {
-		let parsed = ($user_hostname | parse "{user}@{hostname}" | first)
-		ssh -o $"HostName (tailscale peer $parsed.hostname | get ipv6)" $user_hostname ...$ssh_flags
-	} else {
-		ssh -o $"HostName (tailscale peer $user_hostname | get ipv6)" $user_hostname ...$ssh_flags
-	}
+	let hostname = ($user_hostname | parse -r "([^@]*@)?(?<hostname>.*)" | get 0.hostname)
+	ssh -o $"HostName (tailscale peer $hostname | get ipv6)" $user_hostname ...$ssh_flags
 }
 
 # SCP to a tailscale peer
@@ -53,7 +49,7 @@ def "tailscale scp" [
 
 	let options = (
 		[$from, $to] |
-		parse "{hostname}:{path}" |
+		parse -r "([^@]*@)?(?<hostname>.*):(?<path>.*)" |
 		each { |it| $"HostName (tailscale peer $it.hostname | get ipv6)" } |
 		each { |option| ["-o", $option] } |
 		flatten