machineconfig 6.23__py3-none-any.whl → 8.12__py3-none-any.whl

machineconfig/scripts/python/{helper_navigator → helpers_navigator}/command_tree.py

@@ -3,7 +3,7 @@ Command tree widget for displaying command hierarchy.
 """
 
 from textual.widgets import Tree
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo
 
 
 class CommandTree(Tree[CommandInfo]):
@@ -188,15 +188,31 @@ class CommandTree(Tree[CommandInfo]):
             description="Configure your shell profile",
             command="devops config shell",
             parent="config",
-            help_text="devops config shell <copy|reference>"
+            help_text="devops config shell --which <default|nushell>"
         ))
 
-        config_node.add("🔗 pwsh_theme - Configure PowerShell theme", data=CommandInfo(
-            name="pwsh_theme",
-            description="Configure your PowerShell theme",
-            command="devops config pwsh_theme",
+        config_node.add("🔗 starship-theme - Select starship theme", data=CommandInfo(
+            name="starship-theme",
+            description="Select starship prompt theme",
+            command="devops config starship-theme",
             parent="config",
-            help_text="devops config pwsh_theme"
+            help_text="devops config starship-theme"
+        ))
+
+        config_node.add("🔗 pwsh-theme - Configure PowerShell theme", data=CommandInfo(
+            name="pwsh-theme",
+            description="Select powershell prompt theme",
+            command="devops config pwsh-theme",
+            parent="config",
+            help_text="devops config pwsh-theme"
+        ))
+
+        config_node.add("🔗 copy-assets - Copy asset files", data=CommandInfo(
+            name="copy-assets",
+            description="Copy asset files from library to machine",
+            command="devops config copy-assets",
+            parent="config",
+            help_text="devops config copy-assets <scripts|settings|both>"
         ))
 
         # data subcommands
@@ -241,28 +257,52 @@ class CommandTree(Tree[CommandInfo]):
             help_text="devops network share-terminal"
         ))
 
-        network_node.add("� install_ssh_server - Install SSH server", data=CommandInfo(
-            name="install_ssh_server",
+        network_node.add("🌐 share-server - Start local/global server", data=CommandInfo(
+            name="share-server",
+            description="Start local/global server to share files/folders via web browser",
+            command="devops network share-server",
+            parent="network",
+            help_text="devops network share-server"
+        ))
+
+        network_node.add("📡 install-ssh-server - Install SSH server", data=CommandInfo(
+            name="install-ssh-server",
             description="Install SSH server",
-            command="devops network install_ssh_server",
+            command="devops network install-ssh-server",
             parent="network",
-            help_text="devops network install_ssh_server"
+            help_text="devops network install-ssh-server"
         ))
 
-        network_node.add("� add_ssh_key - Add SSH public key", data=CommandInfo(
-            name="add_ssh_key",
+        network_node.add("🔑 add-ssh-key - Add SSH public key", data=CommandInfo(
+            name="add-ssh-key",
             description="Add SSH public key to this machine",
-            command="devops network add_ssh_key",
+            command="devops network add-ssh-key",
             parent="network",
-            help_text="devops network add_ssh_key --path <file> --choose --value --github <username>"
+            help_text="devops network add-ssh-key --path <file> --choose --value --github <username>"
         ))
 
-        network_node.add("�️  add_ssh_identity - Add SSH identity", data=CommandInfo(
-            name="add_ssh_identity",
+        network_node.add("🗝️ add-ssh-identity - Add SSH identity", data=CommandInfo(
+            name="add-ssh-identity",
             description="Add SSH identity (private key) to this machine",
-            command="devops network add_ssh_identity",
+            command="devops network add-ssh-identity",
+            parent="network",
+            help_text="devops network add-ssh-identity"
+        ))
+
+        network_node.add("📌 show-address - Show computer addresses", data=CommandInfo(
+            name="show-address",
+            description="Show this computer addresses on network",
+            command="devops network show-address",
+            parent="network",
+            help_text="devops network show-address"
+        ))
+
+        network_node.add("🐛 debug-ssh - Debug SSH connection", data=CommandInfo(
+            name="debug-ssh",
+            description="Debug SSH connection",
+            command="devops network debug-ssh",
             parent="network",
-            help_text="devops network add_ssh_identity"
+            help_text="devops network debug-ssh"
         ))
 
         # self subcommands
@@ -314,6 +354,22 @@ class CommandTree(Tree[CommandInfo]):
             help_text="devops self navigate"
         ))
 
+        self_node.add("📚 readme - Render README markdown", data=CommandInfo(
+            name="readme",
+            description="Render readme markdown in terminal",
+            command="devops self readme",
+            parent="self",
+            help_text="devops self readme"
+        ))
+
+        self_node.add("🐍 python - Run Python command/file", data=CommandInfo(
+            name="python",
+            description="Run python command/file in the machineconfig environment",
+            command="devops self python",
+            parent="self",
+            help_text="devops self python <path> --command"
+        ))
+
         # fire command - now a typer sub-app
         fire_node = self.root.add("🔥 fire - Fire jobs execution", data=CommandInfo(
             name="fire",
@@ -463,9 +519,9 @@ class CommandTree(Tree[CommandInfo]):
         ))
 
         # croshell command
-        self.root.add("� croshell - Interactive shell", data=CommandInfo(
+        self.root.add("🔄 croshell - Cross-shell command execution", data=CommandInfo(
             name="croshell",
-            description="Interactive shell with various options",
+            description="Cross-shell command execution",
             command="croshell",
             is_group=False,
             module_path="machineconfig.scripts.python.croshell",
@@ -473,11 +529,92 @@ class CommandTree(Tree[CommandInfo]):
         ))
 
         # ftpx command
-        self.root.add("📡 ftpx - File transfer", data=CommandInfo(
+        self.root.add("📡 ftpx - File transfer utility", data=CommandInfo(
             name="ftpx",
-            description="File transfer between machines",
+            description="File transfer utility through SSH",
             command="ftpx",
             is_group=False,
             module_path="machineconfig.scripts.python.ftpx",
             help_text="ftpx <source> <target> --recursive --zipFirst --cloud"
+        ))
+
+        # utils command
+        utils_node = self.root.add("🛠️ utils - Utility commands", data=CommandInfo(
+            name="utils",
+            description="Utility commands",
+            command="utils",
+            is_group=True,
+            module_path="machineconfig.scripts.python.utils"
+        ))
+
+        utils_node.add("💀 kill-process - Kill processes", data=CommandInfo(
+            name="kill-process",
+            description="Choose a process to kill interactively",
+            command="utils kill-process",
+            parent="utils",
+            help_text="utils kill-process --interactive"
+        ))
+
+        utils_node.add("📚 path - Navigate PATH variable", data=CommandInfo(
+            name="path",
+            description="Navigate PATH variable with TUI",
+            command="utils path",
+            parent="utils",
+            help_text="utils path"
+        ))
+
+        utils_node.add("⬆️ upgrade-packages - Upgrade dependencies", data=CommandInfo(
+            name="upgrade-packages",
+            description="Upgrade project dependencies",
+            command="utils upgrade-packages",
+            parent="utils",
+            help_text="utils upgrade-packages"
+        ))
+
+        utils_node.add("⬇️ download - Download file", data=CommandInfo(
+            name="download",
+            description="Download a file from a URL and optionally decompress it",
+            command="utils download",
+            parent="utils",
+            help_text="utils download <url> --destination <path> --decompress"
+        ))
+
+        utils_node.add("🖥️ get-machine-specs - Get machine specifications", data=CommandInfo(
+            name="get-machine-specs",
+            description="Get machine specifications",
+            command="utils get-machine-specs",
+            parent="utils",
+            help_text="utils get-machine-specs"
+        ))
+
+        utils_node.add("🚀 init-project - Initialize project", data=CommandInfo(
+            name="init-project",
+            description="Initialize a project with a uv virtual environment and install dev packages",
+            command="utils init-project",
+            parent="utils",
+            help_text="utils init-project"
+        ))
+
+        utils_node.add("✏️ edit - Open file in editor", data=CommandInfo(
+            name="edit",
+            description="Open a file in the default editor",
+            command="utils edit",
+            parent="utils",
+            help_text="utils edit <file>"
+        ))
+
+        utils_node.add("📄 pdf-merge - Merge PDF files", data=CommandInfo(
+            name="pdf-merge",
+            description="Merge two PDF files into one",
+            command="utils pdf-merge",
+            parent="utils",
+            help_text="utils pdf-merge <file1> <file2> --output <file>"
+        ))
+
+        utils_node.add("� pdf-compress - Compress PDF file", data=CommandInfo(
+            name="pdf-compress",
+            description="Compress a PDF file",
+            command="utils pdf-compress",
+            parent="utils",
+            help_text="utils pdf-compress <file> --output <file>"
         ))

machineconfig/scripts/python/{helper_navigator → helpers_navigator}/main_app.py

@@ -6,11 +6,11 @@ import subprocess
 from textual.app import App, ComposeResult
 from textual.widgets import Header, Footer, Input, Tree
 from textual.binding import Binding
-from machineconfig.scripts.python.helper_navigator.command_builder import CommandBuilderScreen
-from machineconfig.scripts.python.helper_navigator.command_tree import CommandTree
-from machineconfig.scripts.python.helper_navigator.command_detail import CommandDetail
-from machineconfig.scripts.python.helper_navigator.search_bar import SearchBar
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo
+from machineconfig.scripts.python.helpers_navigator.command_builder import CommandBuilderScreen
+from machineconfig.scripts.python.helpers_navigator.command_tree import CommandTree
+from machineconfig.scripts.python.helpers_navigator.command_detail import CommandDetail
+from machineconfig.scripts.python.helpers_navigator.search_bar import SearchBar
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo
 
 
 class CommandNavigatorApp(App[None]):

machineconfig/scripts/python/helpers_network/address.py

@@ -0,0 +1,176 @@
+
+from typing import Optional, TypedDict, cast
+
+class CountryFlag(TypedDict, total=False):
+    emoji: str
+    unicode: str
+
+class CountryCurrency(TypedDict, total=False):
+    code: str
+    symbol: str
+
+class Continent(TypedDict, total=False):
+    code: str
+    name: str
+
+class PublicIpInfo(TypedDict, total=True):
+    ip: str
+    hostname: str
+    city: str
+    region: str
+    country: str
+    country_name: str
+    country_flag: CountryFlag
+    country_flag_url: str
+    country_currency: CountryCurrency
+    continent: Continent
+    loc: str
+    org: str
+    postal: str
+    timezone: str
+
+
+def get_public_ip_address() -> PublicIpInfo:
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
+    import subprocess
+    install_if_missing("ipinfo")
+    result = subprocess.run(
+        ["ipinfo", "myip", "--json"],
+        check=True,
+        capture_output=True,
+        text=True,
+        encoding="utf-8",
+    )
+    import json
+    loaded_json: PublicIpInfo = json.loads(result.stdout)
+    return loaded_json
+
+
+def get_all_ipv4_addresses() -> list[tuple[str, str]]:
+    import psutil
+    import socket
+    result: list[tuple[str, str]] = []
+    for iface, addrs in psutil.net_if_addrs().items():
+        for addr in addrs:
+            if addr.family == socket.AF_INET:
+                ip = addr.address
+                result.append((iface, ip))
+    return result
+
+
+def select_lan_ipv4(prefer_vpn: bool) -> Optional[str]:
+    """
+    Choose the best 'real LAN' IPv4:
+      - Excludes loopback/link-local and (by default) VPN/tunnel/container ifaces
+      - Prefers physical-looking ifaces (eth/en*/wlan/wl*)
+      - Prefers RFC1918 LANs: 192.168/16 > 10/8 > 172.16/12
+      - Requires interface is UP
+    Set prefer_vpn=True to allow tunnel/VPN ifaces to compete.
+    """
+
+    import ipaddress
+    import re
+    from collections.abc import Sequence
+    import psutil
+
+    # Down-rank or exclude: tunnels/VPNs/bridges/containers (add your own if needed)
+    VIRTUAL_IFACE_PAT = re.compile(
+        r"^(?:lo|loopback|docker\d*|br-.*|veth.*|virbr.*|bridge.*|"
+        r"vboxnet.*|vmnet.*|zt.*|ham.*|tailscale.*|wg\d*|utun\d*|llw\d*|awdl\d*|"
+        r"tun\d*|tap\d*|cloudflarewarp.*|warp.*)$",
+        re.IGNORECASE,
+    )
+
+    # Light preference for names that look like real NICs
+    PHYSICAL_IFACE_PAT = re.compile(
+        r"^(?:eth\d*|en\d*|enp.*|ens.*|eno.*|wlan\d*|wl.*|.*wifi.*|.*ethernet.*)$",
+        re.IGNORECASE,
+    )
+
+    # Known noisy CIDRs to avoid
+    NOISY_NETS: list[ipaddress.IPv4Network] = [
+        ipaddress.IPv4Network("100.64.0.0/10"),   # CGNAT (Tailscale/others)
+        ipaddress.IPv4Network("172.17.0.0/16"),   # docker0 default
+        ipaddress.IPv4Network("172.18.0.0/16"),
+        ipaddress.IPv4Network("172.19.0.0/16"),
+        ipaddress.IPv4Network("192.168.49.0/24"), # minikube default
+        ipaddress.IPv4Network("10.0.2.0/24"),     # VirtualBox NAT
+    ]
+
+    def _in_any(ip: ipaddress.IPv4Address, nets: Sequence[ipaddress.IPv4Network]) -> bool:
+        return any(ip in n for n in nets)
+
+    stats = psutil.net_if_stats()
+    best = None
+    best_score = -10**9
+    import socket
+    for iface, addrs in psutil.net_if_addrs().items():
+        st = stats.get(iface)
+        if not st or not st.isup:
+            continue
+
+        for a in addrs:
+            if a.family != socket.AF_INET or not a.address:
+                continue
+
+            ip_str = a.address
+            try:
+                ip = cast(ipaddress.IPv4Address, ipaddress.ip_address(ip_str))
+            except ValueError:
+                continue
+
+            # Exclude unusable classes
+            if ip.is_loopback or ip.is_link_local:  # 127.0.0.0/8, 169.254.0.0/16
+                continue
+
+            # Hard filter: if it looks virtual and we don't prefer VPNs, skip it
+            if not prefer_vpn and VIRTUAL_IFACE_PAT.match(iface):
+                continue
+
+            # Hard filter: known noisy subnets (docker, cgnat, etc.)
+            if _in_any(ip, NOISY_NETS) and not prefer_vpn:
+                continue
+
+            # Base score
+            score = 0
+
+            # Prefer physical-looking names
+            if PHYSICAL_IFACE_PAT.match(iface):
+                score += 200
+
+            # Broadcast present usually means L2 LAN (not point-to-point)
+            # (psutil puts it on the same entry as .broadcast)
+            if getattr(a, "broadcast", None):
+                score += 100
+
+            # Prefer private RFC1918; rank families
+            if ip.is_private:
+                # Order: 192.168.x.x > 10.x.x.x > 172.16-31.x.x
+                ip_net = ipaddress.IPv4Network((ip, 32), strict=False)
+                if ipaddress.IPv4Network("192.168.0.0/16").supernet_of(ip_net):
+                    score += 90
+                elif ipaddress.IPv4Network("10.0.0.0/8").supernet_of(ip_net):
+                    score += 70
+                elif ipaddress.IPv4Network("172.16.0.0/12").supernet_of(ip_net):
+                    score += 50
+            else:
+                # Public on a NIC is unusual for a home/office LAN
+                score -= 50
+
+            # Slight nudge by interface speed if known (>0 means psutil knows it)
+            # (Many tunnels report 0)
+            if getattr(st, "speed", 0) > 0:
+                score += 20
+
+            # Deterministic tie-breaker: prefer shorter iface name (eth0 over eth10)
+            score -= len(iface) * 0.01
+
+            if score > best_score:
+                best_score = score
+                best = ip_str
+
+    return best
+
+
+if __name__ == "__main__":
+    print(select_lan_ipv4(False) or "No LAN IPv4 found")

machineconfig/scripts/python/helpers_network/address_switch.py

@@ -0,0 +1,78 @@
+import subprocess
+import time
+
+from machineconfig.scripts.python.helpers_network.address import get_public_ip_address
+
+
+def switch_public_ip_address(max_trials: int = 10, wait_seconds: float = 4.0) -> None:
+    print("🔁 Switching IP ... ")
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
+    install_if_missing("warp-cli")
+
+    current_ip: str | None = None
+    try:
+        current_data = get_public_ip_address()
+        current_ip = current_data.get("ip")
+    except Exception as e:
+        print(f"⚠️ Could not get current IP: {e}")
+
+    print(f"Current IP: {current_ip}")
+
+    for attempt in range(1, max_trials + 1):
+        print(f"\n--- Attempt {attempt}/{max_trials} ---")
+
+        print("🔻 Deactivating current connection ... ")
+        # We use check=False because if it's already deleted it might return non-zero
+        subprocess.run(["warp-cli", "registration", "delete"], check=False)
+
+        print(f"😴 Sleeping for {wait_seconds} seconds ... ")
+        time.sleep(wait_seconds)
+
+        print("🔼 Registering new connection ... ")
+        res_reg = subprocess.run(["warp-cli", "registration", "new"], check=False)
+        if res_reg.returncode != 0:
+            print("⚠️ Registration failed, retrying loop...")
+            continue
+
+        print("🔗 Connecting ... ")
+        subprocess.run(["warp-cli", "connect"], check=False)
+
+        print(f"😴 Sleeping for {wait_seconds} seconds ... ")
+        time.sleep(wait_seconds)
+
+        print("🔍 Checking status of warp ... ")
+        subprocess.run(["warp-cli", "status"], check=False)
+
+        print("🔍 Checking new IP ... ")
+        new_ip: str | None = None
+        # Retry getting IP a few times before giving up on this connection attempt
+        for ip_check_attempt in range(5):
+            try:
+                new_data = get_public_ip_address()
+                new_ip = new_data["ip"]
+                if new_ip:
+                    break
+            except Exception as e:
+                print(f"⚠️ Error checking new IP (attempt {ip_check_attempt+1}/5): {e}")
+                time.sleep(wait_seconds)
+
+        if new_ip:
+            print(f"New IP: {new_ip}")
+
+            if current_ip and new_ip != current_ip:
+                print("✅ Done ... IP Changed.")
+                return
+            elif current_ip is None:
+                print("✅ Done ... IP obtained (was unknown).")
+                return
+            else:
+                print("❌ IP did not change.")
+        else:
+            print("⚠️ Could not retrieve new IP after multiple attempts.")
+
+    print("❌ Failed to switch IP after max trials.")
+
+
+if __name__ == "__main__":
+    switch_public_ip_address()
+

machineconfig/scripts/python/{nw → helpers_network}/mount_nfs.py

@@ -20,8 +20,8 @@ def main():
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
         ssh = SSH(host=tmp, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
-        default = f"{ssh.hostname}:{ssh.run_shell(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_nfs"
-        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run_shell(command="cat /etc/exports", verbose_output=False, description='Get NFS exports', strict_stderr=False, strict_return_code=False).op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
+        default = f"{ssh.hostname}:{ssh.run_shell_cmd_on_remote(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_nfs"
+        share_info = choose_from_options(msg="📂 Choose a share path:", options=[f"{ssh.hostname}:{item.split(' ')[0]}" for item in ssh.run_shell_cmd_on_remote(command="cat /etc/exports", verbose_output=False, description='Get NFS exports', strict_stderr=False, strict_return_code=False).op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]

machineconfig/scripts/python/{nw → helpers_network}/mount_ssh.py

@@ -19,7 +19,7 @@ def main():
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
         ssh = SSH(host=tmp, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
-        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run_shell(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_ssh"
+        share_info = f"{ssh.username}@{ssh.hostname}:{ssh.run_shell_cmd_on_remote(command='echo $HOME', verbose_output=False, description='Get home directory', strict_stderr=False, strict_return_code=True).op}/data/share_ssh"
     else:
         ssh = SSH(host=share_info.split(":")[0], username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
 

machineconfig/scripts/python/{nw/devops_add_identity.py → helpers_network/ssh_add_identity.py}

@@ -1,4 +1,38 @@
-"""ID"""
+"""ID
+
+On windows:
+
+# on the side of the local machine, you need to sort out the following:
+# if the $sshfile doesn't have a standard name, you will need to explicitly specify the identity while SSHing (e.g. ssh u@s -i ~/.ssh/my_id)
+# However, this must be done every time. For permanent solutions, use .ssh/config
+$sshfile = "$env:USERPROFILE/.ssh/id_rsa"
+Set-Service ssh-agent -StartupType Manual  # allow the service to be started manually
+ssh-agent  # start the service
+ssh-add.exe $sshfile # add the key to the agent
+
+# add key:
+$sshfile=""
+$ErrorActionPreference = "Stop"
+$sshd_dir = "$env:ProgramData/ssh"
+cp "$sshd_dir/administrators_authorized_keys" "$sshd_dir/administrators_authorized_keys.orig"
+Get-Content $sshfile >> "$sshd_dir/administrators_authorized_keys"
+Restart-Service sshd -Force
+
+# copy ssh key:
+# This is the Windows equivalent of copy-ssh-id on Linux.
+# Just like the original function, it is a convenient way of doing two things in one go:
+# 1- copy a certain public key to the remote machine.
+#    scp ~/.ssh/id_rsa.pub $remote_user@$remote_host:~/.ssh/authorized_keys
+# 2- Store the value on the remote in a file called .ssh/authorized_keys
+#    ssh $remote_user@$remote_host "echo $public_key >> ~/.ssh/authorized_keys"
+# Idea from: https://www.chrisjhart.com/Windows-10-ssh-copy-id/
+
+$key_value = cat ($env:USERPROFILE + "/.ssh/id_rsa.pub")
+ssh $args[0] "powershell.exe -Command type $key_value >> .ssh/authorized_keys"
+$my_keys='https://github.com/thisismygitrepo.keys'
+(Invoke-WebRequest $my_keys).Content >> .ssh/authorized_keys
+
+"""
 
 # from platform import system
 from machineconfig.utils.path_extended import PathExtended

machineconfig/scripts/python/{nw/devops_add_ssh_key.py → helpers_network/ssh_add_ssh_key.py}

@@ -13,9 +13,9 @@ import typer
 console = Console()
 
 
-def get_add_ssh_key_script(path_to_key: PathExtended):
+def get_add_ssh_key_script(path_to_key: PathExtended) -> str:
     console.print(Panel("🔑 SSH KEY CONFIGURATION", title="[bold blue]SSH Setup[/bold blue]"))
-    if system() == "Linux":
+    if system() == "Linux" or system() == "Darwin":
         authorized_keys = PathExtended.home().joinpath(".ssh/authorized_keys")
         console.print(Panel(f"🐧 Linux SSH configuration\n📄 Authorized keys file: {authorized_keys}", title="[bold blue]System Info[/bold blue]"))
     elif system() == "Windows":
@@ -35,10 +35,10 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
             program = ""
         else:
             console.print(Panel(f"➕ Adding new SSH key to authorized keys\n🔑 Key file: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
-            if system() == "Linux":
+            if system() == "Linux" or system() == "Darwin":
                 program = f"cat {path_to_key} >> ~/.ssh/authorized_keys"
             elif system() == "Windows":
-                program_path = LIBRARY_ROOT.joinpath("setup_windows/add-sshkey.ps1")
+                program_path = LIBRARY_ROOT.joinpath("setup_windows/ssh/add-sshkey.ps1")
                 program = program_path.expanduser().read_text(encoding="utf-8")
                 place_holder = r'$sshfile = "$env:USERPROFILE\.ssh\pubkey.pub"'
                 assert place_holder in program, f"This section performs string manipulation on the script {program_path} to add the key to the authorized_keys file. The script has changed and the string {place_holder} is not found."
@@ -48,14 +48,14 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
                 raise NotImplementedError
     else:
         console.print(Panel(f"📝 Creating new authorized_keys file\n🔑 Using key: {path_to_key.name}", title="[bold blue]Action[/bold blue]"))
-        if system() == "Linux":
+        if system() == "Linux" or system() == "Darwin":
             program = f"cat {path_to_key} > ~/.ssh/authorized_keys"
         else:
-            program_path = LIBRARY_ROOT.joinpath("setup_windows/openssh-server_add-sshkey.ps1")
+            program_path = LIBRARY_ROOT.joinpath("setup_windows/ssh/openssh-server_add-sshkey.ps1")
             program = PathExtended(program_path).expanduser().read_text(encoding="utf-8").replace('$sshfile=""', f'$sshfile="{path_to_key}"')
             console.print(Panel("🔧 Configured PowerShell script for Windows\n📝 Set key path in script", title="[bold blue]Configuration[/bold blue]"))
 
-    if system() == "Linux":
+    if system() == "Linux" or system() == "Darwin":
         program += """
 sudo chmod 700 ~/.ssh
 sudo chmod 644 ~/.ssh/authorized_keys
@@ -66,6 +66,16 @@ sudo service ssh --full-restart
     return program
 
 
+"""
+Common pitfalls: 
+🚫 Wrong line endings (LF/CRLF) in config files
+🌐 Network port conflicts (try 2222 -> 2223) between WSL and Windows
+sudo service ssh restart
+sudo service ssh status
+sudo nano /etc/ssh/sshd_config
+"""
+
+
 def main(pub_path: Annotated[Optional[str], typer.Argument(..., help="Path to the public key file")] = None,
          pub_choose: Annotated[bool, typer.Option(..., "--choose", "-c", help="Choose from available public keys in ~/.ssh")] = False,
          pub_val: Annotated[bool, typer.Option(..., "--paste", "-p", help="Paste the public key content manually")] = False,
@@ -127,6 +137,15 @@ def main(pub_path: Annotated[Optional[str], typer.Argument(..., help="Path to th
     console.print(Panel("🚀 SSH KEY AUTHORIZATION READY\nRun the generated script to apply changes", box=box.DOUBLE_EDGE, title_align="left"))
     from machineconfig.utils.code import run_shell_script
     run_shell_script(script=program)
+
+    import machineconfig.scripts.python.helpers_network.address as helper
+    res = helper.select_lan_ipv4(prefer_vpn=False)
+    if res is None:
+        console.print(Panel("❌ ERROR: Could not determine local LAN IPv4 address", title="[bold red]Error[/bold red]", border_style="red"))
+        raise typer.Exit(code=1)
+    local_ip_v4 = res
+
+    console.print(Panel(f"🌐 This computer is accessible at: {local_ip_v4}", title="[bold green]Network Info[/bold green]", border_style="green"))
     console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))