machineconfig 5.15__py3-none-any.whl → 7.66__py3-none-any.whl

machineconfig/scripts/python/helpers_utils/path.py

@@ -0,0 +1,108 @@
+
+
+
+import typer
+
+from typing import Optional
+from typing import Annotated, Literal, TypedDict
+
+
+def path():
+    """📚 NAVIGATE PATH variable with TUI"""
+    from machineconfig.scripts.python import env_manager as navigator
+    from pathlib import Path
+    path = Path(navigator.__file__).resolve().parent.joinpath("path_manager_tui.py")
+    from machineconfig.utils.code import run_shell_script, get_uv_command_executing_python_script
+    uv_with = ["textual"]
+    uv_project_dir = None
+    if not Path.home().joinpath("code/machineconfig").exists():
+        uv_with.append("machineconfig>=7.66")
+    else:
+        uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
+    run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])
+
+
+def init_project(python: Annotated[Literal["3.13", "3.14"], typer.Option("--python", "-p", help="Python version for the uv virtual environment.")]= "3.13") -> None:
+    _ = python
+    from pathlib import Path
+    repo_root = Path.cwd()
+    if not (repo_root / "pyproject.toml").exists():
+        typer.echo("❌ Error: pyproject.toml not found.", err=True)
+        raise typer.Exit(code=1)
+    print("Adding group `plot` with common data science and plotting packages...")
+    script = """
+uv add --group plot \
+    # Data & computation
+    numpy pandas polars duckdb-engine python-magic \
+    # Plotting / visualization
+    matplotlib plotly kaleido \
+    # Notebooks / interactive
+    ipython ipykernel jupyterlab nbformat marimo \
+    # Code analysis / type checking / linting
+    mypy pyright ruff pylint pyrefly \
+    # Packaging / build / dev
+    cleanpy \
+    # CLI / debugging / utilities
+    ipdb pudb \
+    # Type hints for packages
+    types-python-dateutil types-pyyaml types-requests types-tqdm \
+    types-mysqlclient types-paramiko types-pytz types-sqlalchemy types-toml types-urllib3 \
+
+"""
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script)
+
+
+def edit_file_with_hx(path: Annotated[Optional[str], typer.Argument(..., help="The root directory of the project to edit, or a file path.")] = None) -> None:
+    from pathlib import Path
+    if path is None:
+        root_path = Path.cwd()
+        print(f"No path provided. Using current working directory: {root_path}")
+    else:
+        root_path = Path(path).expanduser().resolve()
+        print(f"Using provided path: {root_path}")
+    from machineconfig.utils.accessories import get_repo_root
+    repo_root = get_repo_root(root_path)
+    if repo_root is not None and repo_root.joinpath("pyproject.toml").exists():
+        code = f"""
+cd {repo_root}
+uv add --dev pylsp-mypy python-lsp-server[all] pyright ruff-lsp  # for helix editor.
+source ./.venv/bin/activate
+"""
+    else:
+        code = ""
+    if root_path.is_file():
+        code += f"hx {root_path}"
+    else:
+        code += "hx"
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(code)
+
+
+class MachineSpecs(TypedDict):
+    system: str
+    distro: str
+    home_dir: str
+
+
+def get_machine_specs() -> MachineSpecs:
+    """Write print and return the local machine specs."""
+    import platform
+    UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
+    command = f"""{UV_RUN_CMD} --with distro python -c "import distro; print(distro.name(pretty=True))" """
+    import subprocess
+    from pathlib import Path
+    distro = subprocess.run(command, shell=True, capture_output=True, text=True).stdout.strip()
+    specs: MachineSpecs = {
+        "system": platform.system(),
+        "distro": distro,
+        "home_dir": str(Path.home()),
+    }
+    print(specs)
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT
+    path = CONFIG_ROOT.joinpath("machine_specs.json")
+    CONFIG_ROOT.mkdir(parents=True, exist_ok=True)
+    import json
+    path.write_text(json.dumps(specs, indent=4), encoding="utf-8")
+    return specs
+

machineconfig/scripts/python/interactive.py

@@ -19,9 +19,7 @@ for better user experience with checkbox selections.
 
 import sys
 from pathlib import Path
-from platform import system
-from typing import cast
-
+import platform
 import questionary
 from questionary import Choice
 from rich.console import Console
@@ -29,14 +27,42 @@ from rich.panel import Panel
 from rich.text import Text
 from machineconfig.utils.code import run_shell_script
 
-_ = cast
 console = Console()
 
 
 def display_header() -> None:
-    header_text = Text("MACHINE CONFIGURATION", style="bold magenta")
-    subtitle_text = Text("Interactive Installation Script", style="italic cyan")
-    console.print(Panel(f"📦 {header_text}\n{subtitle_text}", border_style="blue", padding=(1, 2)))
+    from machineconfig.utils.installer_utils.installer_runner import get_machineconfig_version
+    from rich.align import Align
+
+    # Fancy ASCII art header
+    ascii_art = """
+    ╔═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
+    ║                                                                                                             ║
+    ║   ███╗   ███╗ █████╗  ██████╗██╗  ██╗██╗███╗   ██╗███████╗ ██████╗ ██████╗ ███╗   ██╗███████╗██╗ ██████╗    ║
+    ║   ████╗ ████║██╔══██╗██╔════╝██║  ██║██║████╗  ██║██╔════╝██╔════╝██╔═══██╗████╗  ██║██╔════╝██║██╔════╝    ║
+    ║   ██╔████╔██║███████║██║     ███████║██║██╔██╗ ██║█████╗  ██║     ██║   ██║██╔██╗ ██║█████╗  ██║██║  ███╗   ║
+    ║   ██║╚██╔╝██║██╔══██║██║     ██╔══██║██║██║╚██╗██║██╔══╝  ██║     ██║   ██║██║╚██╗██║██╔══╝  ██║██║   ██║   ║
+    ║   ██║ ╚═╝ ██║██║  ██║╚██████╗██║  ██║██║██║ ╚████║███████╗╚██████╗╚██████╔╝██║ ╚████║██║     ██║╚██████╔╝   ║
+    ║   ╚═╝     ╚═╝╚═╝  ╚═╝ ╚═════╝╚═╝  ╚═╝╚═╝╚═╝  ╚═══╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝  ╚═══╝╚═╝     ╚═╝ ╚═════╝    ║
+    ║                                                                                                             ║
+    ╚═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
+    """
+
+    version = get_machineconfig_version()
+    title = f"✨ MACHINE CONFIGURATION v{version} ✨"
+    subtitle = "🎯 Your digital life manager. Dotfiles, data, code and more."
+    bug_report = "🐛 Please report bugs to Alex Al-Saffar @ https://github.com/thisismygitrepo/machineconfig"
+
+    # Print ASCII art
+    console.print(Text(ascii_art, style="bold cyan"))
+    console.print()
+    
+    # Print centered text elements
+    console.print(Align.center(Text(title, style="bold bright_magenta")))
+    console.print(Align.center(Text(subtitle, style="italic bright_blue")))
+    console.print()
+    console.print(Align.center(Text(bug_report, style="dim white")))
+    console.print()
 def display_completion_message() -> None:
     completion_text = Text("INSTALLATION COMPLETE", style="bold green")
     subtitle_text = Text("System setup finished successfully", style="italic green")
@@ -67,68 +93,40 @@ def display_dotfiles_instructions() -> None:
 def get_installation_choices() -> list[str]:
     """Get user choices for installation options."""
     choices = [
-        Choice(value="upgrade_system", title="🔄 Upgrade System Packages        - Update all system packages", checked=False),
-        Choice(value="ESSENTIAL_SYSTEM", title="📥 Install Apps                    - Install base system applications", checked=False),
-        Choice(value="ESSENTIAL", title="⚡ Install CLI Apps               - Command-line tools installation", checked=False),
-        Choice(value="DEV_SYSTEM", title="🛠️  Install Development Tools      - rust, libssl-dev, ffmpeg, wezterm, brave, code", checked=False),
-        Choice(value="TerminalEyeCandy", title="🎨 Install ASCII Art Libraries    - Terminal visualization tools", checked=False),
-        Choice(value="install_repos", title="🐍 Install Repos                - Set up Python environment and repositories permanently.", checked=False),
-        Choice(value="install_ssh_server", title="🔒 Install SSH Server             - Set up remote access", checked=False),
-        Choice(value="install_shell_profile", title="🐚 Configure Shell Profile         - Source machineconfig shell initialization", checked=False),
-        Choice(value="create_symlinks", title="🔗 Create Symlinks                - Set up configuration symlinks (finish dotfiles transfer first)", checked=False),
-        Choice(value="retrieve_repositories", title="📚 Retrieve Repositories          - Clone repositories to ~/code", checked=False),
-        Choice(value="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
+        Choice(value="install_machineconfig", title="🐍 Install machineconfig cli.", checked=False),
+        Choice(value="sysabc", title="📥 Install System Package Manager (Needed for other apps to be installed).", checked=False),
+        Choice(value="termabc", title="⚡ Install Terminal CLI apps essentials (group `termabc`)", checked=False),
+        Choice(value="install_shell_profile", title="🐚 Configure Shell Profile And Map Other Configs.", checked=False),
+        Choice(value="install_ssh_server", title="🔒 [ADVANCED] Configure SSH Server", checked=False),
+        Choice(value="retrieve_repositories", title="📚 [ADVANCED] Retrieve Repositories", checked=False),
+        Choice(value="retrieve_data", title="💾 [ADVANCED] Retrieve Data.", checked=False),
     ]
-    # Add Windows-specific options
-    if system() == "Windows":
-        choices.append(Choice(value="install_windows_desktop", title="💻 Install Windows Desktop Apps   - Brave, Windows Terminal, PowerShell, VSCode (Windows only)", checked=False))
     selected = questionary.checkbox("Select the installation options you want to execute:", choices=choices, show_description=True).ask()
     return selected or []
 
 
 def execute_installations(selected_options: list[str]) -> None:
-    if system() == "Windows":
-        from machineconfig import setup_windows as module
-        script_path = Path(module.__file__).parent / "ve.ps1"
-        run_shell_script(script_path.read_text(encoding="utf-8"))
-    else:
-        from machineconfig import setup_linux as module
-        script_path = Path(module.__file__).parent / "ve.sh"
-        run_shell_script(script_path.read_text(encoding="utf-8"))
-
     for maybe_a_group in selected_options:
-        if maybe_a_group in ("ESSENTIAL", "DEV", "ESSENTIAL_SYSTEM", "DEV_SYSTEM", "TerminalEyeCandy"):
+        if maybe_a_group in ("termabc", "sysabc"):
             console.print(Panel("⚡ [bold bright_yellow]CLI APPLICATIONS[/bold bright_yellow]\n[italic]Command-line tools installation[/italic]", border_style="bright_yellow"))
             console.print("🔧 Installing CLI applications", style="bold cyan")
             try:
-                from machineconfig.utils.installer_utils.installer import main as devops_devapps_install_main
-                devops_devapps_install_main(group=maybe_a_group)  # type: ignore
+                from machineconfig.utils.installer_utils.installer_cli import main as devops_devapps_install_main
+                devops_devapps_install_main(group=True, which=maybe_a_group, interactive=False)
                 console.print("✅ CLI applications installed successfully", style="bold green")
             except Exception as e:
                 console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
-            run_shell_script(". $HOME/.bashrc")
-
-    if "upgrade_system" in selected_options:
-        if system() == "Windows":
-            console.print("❌ System upgrade is not applicable on Windows via this script.", style="bold red")
-        elif system() == "Linux":
-            console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
-            run_shell_script("sudo nala upgrade -y")
-        else:
-            console.print(f"❌ System upgrade not supported on {system()}.", style="bold red")
-    if "install_repos" in selected_options:
+            if platform.system() != "Windows":
+                run_shell_script(". $HOME/.bashrc")
+
+    if "install_machineconfig" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        if system() == "Windows":
-            from machineconfig import setup_windows as module
-            script_path = Path(module.__file__).parent / "repos.ps1"
-        else:
-            from machineconfig import setup_linux as module
-            script_path = Path(module.__file__).parent / "repos.sh"
-        run_shell_script(script_path.read_text(encoding="utf-8"))
+        from machineconfig.scripts.python.helpers_devops.cli_self import install
+        install()
 
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
-        if system() == "Windows":
+        if platform.system() == "Windows":
             powershell_script = """Write-Host "🔧 Installing and configuring SSH server..."
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
 Start-Service sshd
@@ -141,54 +139,36 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         console.print(Panel("🐚 [bold green]SHELL PROFILE[/bold green]\n[italic]Shell configuration setup[/italic]", border_style="green"))
         console.print("🔧 Configuring shell profile", style="bold cyan")
         try:
-            from machineconfig.profile.create import main_profile
-
-            main_profile()
+            from machineconfig.profile.create_shell_profile import create_default_shell_profile
+            create_default_shell_profile()
             console.print("✅ Shell profile configured successfully", style="bold green")
+            from machineconfig.profile.create_links_export import main_public_from_parser
+            main_public_from_parser(method="copy", on_conflict="overwrite-default-path", which="all", interactive=False)
+            if platform.system() == "Windows":
+                from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
+                install_nerd_fonts()
+                from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
+                set_wt_settings_main()
         except Exception as e:
             console.print(f"❌ Error configuring shell profile: {e}", style="bold red")
 
-    if "create_symlinks" in selected_options:
-        display_dotfiles_instructions()
-        dotfiles_ready = questionary.confirm("📂 Have you finished copying dotfiles?", default=True).ask()
-        if dotfiles_ready:
-            console.print(Panel("🔗 [bold cyan]SYMLINK CREATION[/bold cyan]\n[italic]Configuration setup[/italic]", border_style="cyan"))
-            console.print("🔧 Creating symlinks", style="bold cyan")
-            try:
-                from machineconfig.profile.create import main_symlinks
-                main_symlinks()
-                console.print("✅ Symlinks created successfully", style="bold green")
-            except Exception as e:
-                console.print(f"❌ Error creating symlinks: {e}", style="bold red")
-            run_shell_script("sudo chmod 600 $HOME/.ssh/*")
-            run_shell_script("sudo chmod 700 $HOME/.ssh")
-        else:
-            console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
-
     if "retrieve_repositories" in selected_options:
         console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
-        from machineconfig.scripts.python import repos
-        repos.clone(directory=str(Path.home() / "code"), cloud="odg1")
+        from machineconfig.scripts.python.helpers_devops import cli_repos
+        cli_repos.clone(directory=str(Path.home() / "code"), cloud="odg1")
 
     if "retrieve_data" in selected_options:
         console.print(Panel("💾 [bold bright_cyan]DATA RETRIEVAL[/bold bright_cyan]\n[italic]Backup restoration[/italic]", border_style="bright_cyan"))
         console.print("🔧 Retrieving backup data", style="bold cyan")
         try:
-            from machineconfig.scripts.python.devops_backup_retrieve import main_backup_retrieve
-            main_backup_retrieve(direction="RETRIEVE")
+            from machineconfig.scripts.python.helpers_devops.devops_backup_retrieve import main_backup_retrieve
+            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None)
             console.print("✅ Backup data retrieved successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")
 
-    if "install_windows_desktop" in selected_options:
-        from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
-        install_nerd_fonts()
-        from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
-        set_wt_settings_main()
-
 
 def main() -> None:
-    """Main function to run the interactive installation."""
     display_header()
     selected_options = get_installation_choices()
     if not selected_options:
@@ -199,7 +179,7 @@ def main() -> None:
     if not proceed:
         console.print("❌ Installation cancelled.", style="bold red")
         sys.exit(0)
-    execute_installations(selected_options)
+    execute_installations(selected_options=selected_options)
     display_completion_message()
 
 

machineconfig/scripts/python/machineconfig.py

@@ -0,0 +1,63 @@
+
+from machineconfig.scripts.python.devops import get_app as get_devops_app
+from machineconfig.scripts.python.cloud import get_app as get_cloud_app
+from machineconfig.scripts.python.agents import get_app as get_agents_app
+from machineconfig.scripts.python.sessions import get_app as get_sessions_app
+from machineconfig.scripts.python.utils import get_app as get_utils_app
+
+from machineconfig.scripts.python.ftpx import ftpx as ftpx_func
+from machineconfig.scripts.python.croshell import croshell as croshell_func
+from machineconfig.scripts.python.fire_jobs import fire as get_fire_jobs_app
+from machineconfig.scripts.python.define import get_app as get_define_app
+from machineconfig.scripts.python.terminal import get_app as get_terminal_app
+
+def get_app():
+    import typer
+    app = typer.Typer(help="MachineConfig CLI - Manage your machine configurations and workflows", no_args_is_help=True, add_help_option=False, add_completion=False)
+    devops_app = get_devops_app()
+    app.add_typer(devops_app, name="devops", help="[d] DevOps related commands", no_args_is_help=True)
+    app.add_typer(devops_app, name="d", hidden=True)  # short alias
+
+    cloud_app = get_cloud_app()
+    app.add_typer(cloud_app, name="cloud", help="[c] Cloud management commands", no_args_is_help=True)
+    app.add_typer(cloud_app, name="c", hidden=True)  # short alias
+
+    sessions_app = get_sessions_app()
+    app.add_typer(sessions_app, name="sessions", help="[s] Session and layout management", no_args_is_help=True)
+    app.add_typer(sessions_app, name="s", hidden=True)  # short alias
+
+
+    agents_app = get_agents_app()
+    app.add_typer(agents_app, name="agents", help="[a] 🤖 AI Agents management commands", no_args_is_help=True)
+    app.add_typer(agents_app, name="a", hidden=True)  # short alias
+
+    app.command(name="fire", help="[f] Fire and manage jobs", no_args_is_help=False)(get_fire_jobs_app)
+    app.command(name="f", hidden=True, no_args_is_help=False)(get_fire_jobs_app)
+    app.command("ftpx", no_args_is_help=True, help="[ff] File transfer utility though SSH")(ftpx_func)
+    app.command("ff", no_args_is_help=True, hidden=True)(ftpx_func)  # short alias
+    app.command("croshell", no_args_is_help=False, help="[r] Cross-shell command execution")(croshell_func)
+    app.command("r", no_args_is_help=False, hidden=True)(croshell_func)  # short alias
+
+    utils_app = get_utils_app()
+    app.add_typer(utils_app, name="utils", help="[u] Utility commands", no_args_is_help=True)
+    app.add_typer(utils_app, name="u", hidden=True)  # short alias
+
+    define_app = get_define_app()
+    app.add_typer(define_app, name="define", help="[df] Define and manage configurations", no_args_is_help=True)
+    app.add_typer(define_app, name="df", hidden=True)  # short alias
+
+
+    terminal_app = get_terminal_app()
+    app.add_typer(terminal_app, name="terminal", help="[t] Terminal management commands", no_args_is_help=True)
+    app.add_typer(terminal_app, name="t", hidden=True)  # short alias
+
+    return app
+
+
+def main():
+    app = get_app()
+    app()
+
+
+if __name__ == "__main__":
+    main()

machineconfig/scripts/python/msearch.py

@@ -0,0 +1,21 @@
+
+import typer
+
+
+def machineconfig_find():
+    from machineconfig.scripts.python.helpers_msearch import FZFG_LINUX_PATH, FZFG_WINDOWS_PATH
+    import platform
+    if platform.system() == "Linux":
+        script_path = FZFG_LINUX_PATH
+    elif platform.system() == "Windows":
+        script_path = FZFG_WINDOWS_PATH
+    else:
+        raise RuntimeError("Unsupported platform")
+    from machineconfig.utils.code import exit_then_run_shell_script
+    exit_then_run_shell_script(script=script_path.read_text(encoding="utf-8"), strict=False)
+
+
+def main():
+    app = typer.Typer(add_completion=False, no_args_is_help=True)
+    app.command(name="msearch", help="machineconfig search helper", no_args_is_help=False)(machineconfig_find)
+    app()

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

@@ -12,9 +12,7 @@ BOX_WIDTH = 150  # width for box drawing
 def main() -> None:
     title = "🔑 SSH IDENTITY MANAGEMENT"
     print(Panel(Text(title, justify="center"), expand=False))
-
     print(Panel("🔍 Searching for existing SSH keys...", expand=False))
-
     private_keys = [x.with_name(x.stem) for x in PathExtended.home().joinpath(".ssh").search("*.pub")]
     private_keys = [x for x in private_keys if x.exists()]
     if private_keys:

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

@@ -2,20 +2,20 @@
 
 from platform import system
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.path_extended import PathExtended
 from rich.console import Console
 from rich.panel import Panel
-from rich import box  # Import box
+from rich import box
+from typing import Optional, Annotated
+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":
@@ -30,16 +30,15 @@ def get_add_ssh_key_script(path_to_key: PathExtended):
         keys_text = authorized_keys.read_text(encoding="utf-8").split(split)
         key_count = len([k for k in keys_text if k.strip()])
         console.print(Panel(f"🔍 Current SSH authorization status\n✅ Found {key_count} authorized key(s)", title="[bold blue]Status[/bold blue]"))
-
         if path_to_key.read_text(encoding="utf-8") in authorized_keys.read_text(encoding="utf-8"):
             console.print(Panel(f"⚠️  Key already authorized\nKey: {path_to_key.name}\nStatus: Already present in authorized_keys file\nNo action required", title="[bold yellow]Warning[/bold yellow]"))
             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/openssh-server_add-sshkey.ps1")
+                program_path = LIBRARY_ROOT.joinpath("setup_windows/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."
@@ -49,16 +48,15 @@ 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 = 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
 sudo chmod 644 ~/.ssh/*.pub
@@ -68,51 +66,83 @@ sudo service ssh --full-restart
     return program
 
 
-def main() -> None:
-    console.print(Panel("🔐 SSH PUBLIC KEY AUTHORIZATION TOOL", box=box.DOUBLE_EDGE, title_align="left"))
-
-    console.print(Panel("🔍 Searching for public keys...", title="[bold blue]SSH Setup[/bold blue]", border_style="blue"))
-
-    pub_keys = PathExtended.home().joinpath(".ssh").search("*.pub")
-
-    if pub_keys:
-        console.print(Panel(f"✅ Found {len(pub_keys)} public key(s)", title="[bold green]Status[/bold green]", border_style="green"))
-    else:
-        console.print(Panel("⚠️  No public keys found", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+"""
+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
+"""
 
-    all_keys_option = f"all pub keys available ({len(pub_keys)})"
-    i_have_path_option = "I have the path to the key file"
-    i_paste_option = "I want to paste the key itself"
 
-    res = choose_from_options("Which public key to add? ", options=[str(x) for x in pub_keys] + [all_keys_option, i_have_path_option, i_paste_option], multi=False)
-    if res == all_keys_option:
+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,
+         from_github: Annotated[Optional[str], typer.Option(..., "--from-github", "-g", help="Fetch public keys from a GitHub username")] = None
+         ) -> None:
+    
+    if pub_path:
+        key_path = PathExtended(pub_path).expanduser().absolute()
+        key_path.parent.mkdir(parents=True, exist_ok=True)
+        if not key_path.exists():
+            console.print(Panel(f"❌ ERROR: Provided key path does not exist\nPath: {key_path}", title="[bold red]Error[/bold red]"))
+            raise FileNotFoundError(f"Provided key path does not exist: {key_path}")
+        console.print(Panel(f"📄 Using provided public key file: {key_path}", title="[bold blue]Info[/bold blue]"))
+        program = get_add_ssh_key_script(key_path)
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script=program)
+        console.print(Panel("✅ SSH KEY AUTHORIZATION COMPLETED", box=box.DOUBLE_EDGE, title_align="left"))
+        return
+    elif pub_choose:
+        console.print(Panel("🔐 SSH PUBLIC KEY AUTHORIZATION TOOL", box=box.DOUBLE_EDGE, title_align="left"))
+        console.print(Panel("🔍 Searching for public keys...", title="[bold blue]SSH Setup[/bold blue]", border_style="blue"))
+        pub_keys = PathExtended.home().joinpath(".ssh").search("*.pub")
+        if pub_keys:
+            console.print(Panel(f"✅ Found {len(pub_keys)} public key(s)", title="[bold green]Status[/bold green]", border_style="green"))
+        else:
+            console.print(Panel("⚠️  No public keys found", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            return
         console.print(Panel(f"🔄 Processing all {len(pub_keys)} public keys...", title="[bold blue]Processing[/bold blue]", border_style="blue"))
         program = "\n\n\n".join([get_add_ssh_key_script(key) for key in pub_keys])
 
-    elif res == i_have_path_option:
-        console.print(Panel("📂 Please provide the path to your public key", title="[bold blue]Input Required[/bold blue]", border_style="blue"))
-        key_path = PathExtended(input("📋 Path: ")).expanduser().absolute()
-        console.print(Panel(f"📄 Using key from path: {key_path}", title="[bold blue]Info[/bold blue]", border_style="blue"))
-        program = get_add_ssh_key_script(key_path)
-
-    elif res == i_paste_option:
+    elif pub_val:
         console.print(Panel("📋 Please provide a filename and paste the public key content", title="[bold blue]Input Required[/bold blue]", border_style="blue"))
         key_filename = input("📝 File name (default: my_pasted_key.pub): ") or "my_pasted_key.pub"
         key_path = PathExtended.home().joinpath(f".ssh/{key_filename}")
+        key_path.parent.mkdir(parents=True, exist_ok=True)
         key_path.write_text(input("🔑 Paste the public key here: "), encoding="utf-8")
         console.print(Panel(f"💾 Key saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
         program = get_add_ssh_key_script(key_path)
-
+    elif from_github:
+        console.print(Panel(f"🌐 Fetching public keys from GitHub user: {from_github}", title="[bold blue]GitHub Fetch[/bold blue]", border_style="blue"))
+        import requests
+        response = requests.get(f"https://api.github.com/users/{from_github}/keys")
+        if response.status_code != 200:
+            console.print(Panel(f"❌ ERROR: Failed to fetch keys from GitHub user {from_github}\nStatus Code: {response.status_code}", title="[bold red]Error[/bold red]", border_style="red"))
+            raise RuntimeError(f"Failed to fetch keys from GitHub user {from_github}: Status Code {response.status_code}")
+        keys = response.json()
+        if not keys:
+            console.print(Panel(f"⚠️  No public keys found for GitHub user: {from_github}", title="[bold yellow]Warning[/bold yellow]", border_style="yellow"))
+            return
+        console.print(Panel(f"✅ Found {len(keys)} public key(s) for user: {from_github}", title="[bold green]Success[/bold green]", border_style="green"))
+        key_path = PathExtended.home().joinpath(f".ssh/{from_github}_github_keys.pub")
+        key_path.parent.mkdir(parents=True, exist_ok=True)
+        key_path.write_text("\n".join([key["key"] for key in keys]), encoding="utf-8")
+        console.print(Panel(f"💾 Keys saved to: {key_path}", title="[bold green]Success[/bold green]", border_style="green"))
+        program = get_add_ssh_key_script(key_path)
     else:
-        console.print(Panel(f"🔑 Using selected key: {PathExtended(res).name}", title="[bold blue]Info[/bold blue]", border_style="blue"))
-        program = get_add_ssh_key_script(PathExtended(res))
-
+        console.print(Panel("❌ ERROR: No method provided to add SSH key\nUse --help for options", title="[bold red]Error[/bold red]", border_style="red"))
+        raise ValueError("No method provided to add SSH key. Use --help for options.")
     console.print(Panel("🚀 SSH KEY AUTHORIZATION READY\nRun the generated script to apply changes", box=box.DOUBLE_EDGE, title_align="left"))
-
-    # return program
-    import subprocess
-
-    subprocess.run(program, shell=True, check=True)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script=program)
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    s.connect(('8.8.8.8', 80))
+    local_ip_v4 = s.getsockname()[0]
+    s.close()
+    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"))
 
 

machineconfig/scripts/{linux → python/nw}/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.13 --no-dev --project $HOME/code/machineconfig python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=7.32" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

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

@@ -19,9 +19,9 @@ def main():
         print("\n🔍 Interactive mode selected for choosing share path.")
         tmp = choose_ssh_host(multi=False)
         assert isinstance(tmp, str)
-        ssh = SSH(tmp)
-        default = f"{ssh.hostname}:{ssh.run('echo $HOME').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("cat /etc/exports").op.split("\n") if not item.startswith("#")] + [default], default=default, multi=False)
+        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)
         assert isinstance(share_info, str), f"❌ share_info must be a string. Got {type(share_info)}"
 
     remote_server = share_info.split(":")[0]