machineconfig 7.98__py3-none-any.whl → 8.61__py3-none-any.whl

machineconfig/scripts/python/{helpers_devops → helpers/helpers_devops}/cli_share_server.py

@@ -1,42 +1,17 @@
 from pathlib import Path
 from typing import Optional, Annotated
-from machineconfig.scripts.python.helpers_devops.cli_share_file import share_file_receive, share_file_send
+from machineconfig.scripts.python.helpers.helpers_devops.cli_share_file import share_file_receive, share_file_send
+from machineconfig.utils.accessories import display_with_flashy_style
 import typer
 
 
-def display_share_url(local_ip_v4: str, port: int, protocol: str = "http") -> None:
-    """Display a flashy, unmissable share URL announcement."""
-    from rich.console import Console
-    from rich.panel import Panel
-    from rich.text import Text
-    from rich.align import Align
-    console = Console()
-    # Create the main message with styling
-    url_text = Text(f"{protocol}://{local_ip_v4}:{port}", style="bold bright_cyan underline")
-    message = Text.assemble(
-        ("🚀 ", "bright_red"),
-        ("Share server is now accessible at: ", "bright_white bold"),
-        url_text,
-        (" 🚀", "bright_red")
-    )
-    # Create a fancy panel with borders and styling
-    panel = Panel(
-        Align.center(message),
-        title="[bold bright_green]🌐 SHARE SERVER READY 🌐[/bold bright_green]",
-        subtitle="[italic bright_yellow]⚡ Click the link above to access your shared files! ⚡[/italic bright_yellow]",
-        border_style="bright_magenta",
-        padding=(1, 2),
-        expand=False
-    )
-    # Print with extra spacing and attention-grabbing elements
-    console.print(panel)
-
-
 def web_file_explorer(
     path: Annotated[str, typer.Argument(help="Path to the file or directory to share")],
     port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the share server on (default: 8080)")] = None,
     username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for share access (default: current user)")] = None,
+    no_auth: Annotated[bool, typer.Option("--no-auth", "-na", help="Disable authentication for share access")] = False,
     password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for share access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None,
+    bind_address: Annotated[str, typer.Option("--bind", "-a", help="Address to bind the server to")] = "0.0.0.0",
     over_internet: Annotated[bool, typer.Option("--over-internet", "-i", help="Expose the share server over the internet using ngrok")] = False,
     backend: Annotated[str, typer.Option("--backend", "-b", help="Backend to use: filebrowser (default), miniserve, qrcp, or easy-sharing")] = "miniserve",
 ) -> None:
@@ -48,22 +23,22 @@ def web_file_explorer(
     install_if_missing(which=backend)
     if over_internet:
         install_if_missing(which="ngrok")
-    if username is None:
-        import getpass
-        username = getpass.getuser()
-    
-    if password is None:
+    if password is None and not no_auth:
         pwd_path = Path.home().joinpath("dotfiles/creds/passwords/quick_password")
         if pwd_path.exists():
             password = pwd_path.read_text(encoding="utf-8").strip()
-        else:
-            typer.echo(f"⚠️  WARNING: Password not provided and default password file does not exist.\nPath: {pwd_path}\nUsing default password: 'quick_password' (insecure!)", err=True)
-            raise typer.Exit(code=1)
+            if username is None:
+                import getpass
+                username = getpass.getuser()
+        # else:
+        #     typer.echo(f"⚠️  WARNING: Password not provided and default password file does not exist.\nPath: {pwd_path}\nUsing default password: 'quick_password' (insecure!)", err=True)
+        #     raise typer.Exit(code=1)
+
 
     if port is None:
         port = 8080
 
-    import machineconfig.scripts.python.helpers_network.address as helper
+    import machineconfig.scripts.python.helpers.helpers_network.address as helper
     res = helper.select_lan_ipv4(prefer_vpn=False)
     if res is None:
         typer.echo("❌ ERROR: Could not determine local LAN IPv4 address for share server.", err=True)
@@ -71,7 +46,7 @@ def web_file_explorer(
     local_ip_v4 = res
 
     protocol = "http"
-    display_share_url(local_ip_v4, port, protocol)
+    display_with_flashy_style(msg=f"{protocol}://{local_ip_v4}:{port}/", title="Local Network Share URL")
     
     path_obj = Path(path).resolve()
     if not path_obj.exists():
@@ -83,14 +58,22 @@ def web_file_explorer(
         db_path.parent.mkdir(parents=True, exist_ok=True)
         command = f"""
 filebrowser users add {username} "{password}" --database {db_path}
-filebrowser --address 0.0.0.0 --port {port} --root "{path_obj}" --database {db_path}
+filebrowser --address {bind_address} --port {port} --root "{path_obj}" --database {db_path}
 """
     elif backend == "miniserve":
-        command = f"""miniserve --port {port} --interfaces 0.0.0.0 --auth {username}:{password} --upload-files --mkdir --enable-tar --enable-tar-gz --enable-zip --qrcode "{path_obj}" """
+        if username and password:
+            auth_line = f"""--auth "{username}:{password}" """
+        else:
+            auth_line = ""
+        command = f"""miniserve --port {port} --interfaces {bind_address} {auth_line} --upload-files --mkdir --enable-tar --enable-tar-gz --enable-zip --qrcode "{path_obj}" """
     elif backend == "easy-sharing":
-        command = f"""easy-sharing --port {port} --username {username} --password "{password}" "{path_obj}" """
+        if username is None and password is None:
+            auth_line = ""
+        else:
+            auth_line = f'--username "{username}" --password "{password}"'
+        command = f"""easy-sharing --port {port} {auth_line} "{path_obj}" """
     elif backend == "qrcp":
-        command = f"""qrcp "{path_obj}" """
+        command = f"""qrcp --port {port} --bind {bind_address} "{path_obj}" """
     else:
         typer.echo(f"❌ ERROR: Unknown backend '{backend}'", err=True)
         raise typer.Exit(code=1)

machineconfig/scripts/python/helpers/helpers_devops/cli_share_temp.py

@@ -0,0 +1,69 @@
+
+import json
+import sys
+from pathlib import Path
+from typing import Annotated
+
+import requests
+import typer
+
+
+TEMP_BASE_URL: str = "https://temp.sh"
+UPLOAD_ENDPOINT: str = f"{TEMP_BASE_URL}/upload"
+
+
+def _extract_url(response: requests.Response) -> str:
+	content_type = response.headers.get("content-type", "")
+	text = response.text.strip()
+	if "application/json" in content_type:
+		try:
+			data = response.json()
+		except (json.JSONDecodeError, ValueError):
+			data = None
+		if isinstance(data, dict):
+			url_value = data.get("url") or data.get("link") or data.get("download")
+			if isinstance(url_value, str) and url_value.strip() != "":
+				return url_value.strip()
+	for token in text.split():
+		if token.startswith("https://") or token.startswith("http://"):
+			return token
+	return text
+
+
+def _upload_file_handle(file_name: str, file_handle: object, content_type: str | None) -> str:
+	files: dict[str, tuple[str, object, str] | tuple[str, object]]
+	if content_type is None:
+		files = {"file": (file_name, file_handle)}
+	else:
+		files = {"file": (file_name, file_handle, content_type)}
+	response = requests.post(UPLOAD_ENDPOINT, files=files)  # type: ignore[reportArgumentType]
+	response.raise_for_status()
+	return _extract_url(response=response)
+
+
+def upload_file(
+	file_path: Annotated[Path, typer.Argument(..., exists=True, dir_okay=False, readable=True)],
+) -> None:
+	try:
+		with file_path.open("rb") as file_handle:
+			url = _upload_file_handle(file_name=file_path.name, file_handle=file_handle, content_type=None)
+	except requests.RequestException as exc:
+		typer.echo(f"Upload failed: {exc}")
+		raise typer.Exit(1)
+	typer.echo(url)
+
+
+def upload_text(
+	text: Annotated[str, typer.Argument(...)],
+) -> None:
+	text_value = text
+	if text == "-":
+		text_value = sys.stdin.read()
+	try:
+		payload = text_value.encode("utf-8")
+		url = _upload_file_handle(file_name="text.txt", file_handle=payload, content_type="text/plain; charset=utf-8")
+	except requests.RequestException as exc:
+		typer.echo(f"Upload failed: {exc}")
+		raise typer.Exit(1)
+	typer.echo(url)
+

machineconfig/scripts/python/{helpers_devops → helpers/helpers_devops}/cli_share_terminal.py

@@ -46,6 +46,7 @@ def share_terminal(
     port: Annotated[Optional[int], typer.Option("--port", "-p", help="Port to run the terminal server on (default: 7681)")] = None,
     username: Annotated[Optional[str], typer.Option("--username", "-u", help="Username for terminal access (default: current user)")] = None,
     password: Annotated[Optional[str], typer.Option("--password", "-w", help="Password for terminal access (default: from ~/dotfiles/creds/passwords/quick_password)")] = None,
+    no_auth: Annotated[bool, typer.Option("--no-auth", "-n", help="Disable authentication (not recommended)")] = False,
     start_command: Annotated[Optional[str], typer.Option("--start-command", "-s", help="Command to run on terminal start (default: bash/powershell)")] = None,
     ssl: Annotated[bool, typer.Option("--ssl", "-S", help="Enable SSL")] = False,
     ssl_cert: Annotated[Optional[str], typer.Option("--ssl-cert", "-C", help="SSL certificate file path")] = None,
@@ -61,12 +62,14 @@ def share_terminal(
     if username is None:
         import getpass
         username = getpass.getuser()
-    if password is None:
+    if password is None and not no_auth:
         pwd_path = Path.home().joinpath("dotfiles/creds/passwords/quick_password")
         if pwd_path.exists():
             password = pwd_path.read_text(encoding="utf-8").strip()
         else:
-            raise ValueError("Password not provided and default password file does not exist.")
+            # raise ValueError("Password not provided and default password file does not exist.")
+            print("❌ Error: Password not provided and default password file does not exist.")
+            raise typer.Exit(code=1)
 
     if port is None:
         port = 7681  # Default port for ttyd
@@ -83,14 +86,17 @@ def share_terminal(
         key_path = Path(ssl_key)
         
         if not cert_path.exists():
-            raise FileNotFoundError(f"SSL certificate file not found: {ssl_cert}")
+            print(f"❌ Error: SSL certificate file not found: {ssl_cert}")
+            raise typer.Exit(code=1)
         if not key_path.exists():
-            raise FileNotFoundError(f"SSL key file not found: {ssl_key}")
+            print(f"❌ Error: SSL key file not found: {ssl_key}")
+            raise typer.Exit(code=1)
         
         if ssl_ca and not Path(ssl_ca).exists():
-            raise FileNotFoundError(f"SSL CA file not found: {ssl_ca}")
+            print(f"❌ Error: SSL CA file not found: {ssl_ca}")
+            raise typer.Exit(code=1)
 
-    import machineconfig.scripts.python.helpers_network.address as helper
+    import machineconfig.scripts.python.helpers.helpers_network.address as helper
     res = helper.select_lan_ipv4(prefer_vpn=False)
     if res is None:
         print("❌ Error: Could not determine local LAN IPv4 address for terminal.")

machineconfig/scripts/python/helpers/helpers_devops/cli_ssh.py

@@ -0,0 +1,167 @@
+import typer
+from typing import Optional, Annotated
+
+
+def install_ssh_server() -> None:
+    """📡 Install SSH server"""
+    import platform
+    if platform.system() == "Windows":
+        script = _get_windows_ssh_server_install_script()
+    elif platform.system() == "Linux" or platform.system() == "Darwin":
+        script = """
+sudo nala install openssh-server -y || true  # try to install first
+# sudo nala purge openssh-server -y
+# sudo nala install openssh-server -y
+echo "✅ FINISHED installing openssh-server."
+"""
+    else:
+        print(f"❌ Error: Platform {platform.system()} is not supported.")
+        raise typer.Exit(code=1)
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script=script, display_script=True, clean_env=False)
+
+
+def change_ssh_port(port: Annotated[int, typer.Option(..., "--port", "-p", help="SSH port to use")] = 2222) -> None:
+    """🔌 Change SSH port (Linux/WSL only, default: 2222)"""
+    import platform
+    if platform.system() != "Linux":
+        print("❌ Error: change_ssh_port requires Linux environment")
+        raise typer.Exit(code=1)
+    from machineconfig.utils.ssh_utils.wsl import change_ssh_port as _change_ssh_port
+    _change_ssh_port(port=port)
+
+
+def _get_windows_ssh_server_install_script(use_winget: bool = True) -> str:
+    install_winget = r'''
+    Write-Host "Installing OpenSSH via winget..." -ForegroundColor Cyan
+    winget install --no-upgrade --Id Microsoft.OpenSSH.Preview --source winget --accept-package-agreements --accept-source-agreements
+    $wingetSshPath = "C:\Program Files\OpenSSH"
+    $currentMachinePath = [System.Environment]::GetEnvironmentVariable("Path", "Machine")
+    if ($currentMachinePath -notlike "*$wingetSshPath*") {
+        Write-Host "Adding OpenSSH to system PATH..." -ForegroundColor Yellow
+        [System.Environment]::SetEnvironmentVariable("Path", "$currentMachinePath;$wingetSshPath", "Machine")
+    }
+    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+'''
+    install_capability = r'''
+    Write-Host "Installing OpenSSH via Windows Capability..." -ForegroundColor Cyan
+    Add-WindowsCapability -Online -Name OpenSSH.Server
+    Add-WindowsCapability -Online -Name OpenSSH.Client
+    $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path", "User")
+'''
+    configure_sshd_service = r'''
+    $serviceExists = Get-Service -Name sshd -ErrorAction SilentlyContinue
+    if (-not $serviceExists) {
+        Write-Host "sshd service not found, registering manually..." -ForegroundColor Yellow
+        sc.exe create sshd binPath= "$sshdExePath" start= auto
+        if ($LASTEXITCODE -ne 0) { throw "Failed to create sshd service" }
+    }
+    Set-Service -Name sshd -StartupType Automatic
+    Start-Service sshd
+    Write-Host "sshd service started successfully." -ForegroundColor Green
+'''
+    configure_firewall = r'''
+    $existingRule = Get-NetFirewallRule -Name "OpenSSH-Server-In-TCP" -ErrorAction SilentlyContinue
+    if (-not $existingRule) {
+        Write-Host "Creating firewall rule for SSH..." -ForegroundColor Yellow
+        New-NetFirewallRule -Name "OpenSSH-Server-In-TCP" -DisplayName "OpenSSH SSH Server" -Enabled True -Direction Inbound -Protocol TCP -Action Allow -LocalPort 22 -Program $sshdExePath
+    } else {
+        Write-Host "Firewall rule already exists." -ForegroundColor Green
+    }
+'''
+    configure_default_shell = r'''
+    Write-Host "Configuring default shell for SSH..." -ForegroundColor Cyan
+    $shell = "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe"
+    if (-not (Test-Path "HKLM:\SOFTWARE\OpenSSH")) { New-Item -Path "HKLM:\SOFTWARE\OpenSSH" -Force | Out-Null }
+    New-ItemProperty -Path "HKLM:\SOFTWARE\OpenSSH" -Name DefaultShell -Value $shell -PropertyType String -Force | Out-Null
+    New-ItemProperty -Path "HKLM:\SOFTWARE\OpenSSH" -Name DefaultShellCommandOption -Value "/c" -PropertyType String -Force | Out-Null
+    Write-Host "Default shell set to: $shell" -ForegroundColor Green
+'''
+    configure_ssh_agent = r'''
+    Write-Host "Configuring ssh-agent service..." -ForegroundColor Cyan
+    $agentService = Get-Service -Name ssh-agent -ErrorAction SilentlyContinue
+    if ($agentService) {
+        Set-Service -Name ssh-agent -StartupType Automatic
+        Start-Service ssh-agent -ErrorAction SilentlyContinue
+        Write-Host "ssh-agent service configured and started." -ForegroundColor Green
+    } else {
+        Write-Host "ssh-agent service not available." -ForegroundColor Yellow
+    }
+'''
+    ensure_ssh_directory = r'''
+    $sshDir = Join-Path $env:USERPROFILE ".ssh"
+    if (-not (Test-Path $sshDir)) {
+        New-Item -ItemType Directory -Path $sshDir -Force | Out-Null
+        Write-Host "Created .ssh directory at: $sshDir" -ForegroundColor Green
+    }
+'''
+    if use_winget:
+        install_method = install_winget
+        sshd_exe_path = r'C:\Program Files\OpenSSH\sshd.exe'
+    else:
+        install_method = install_capability
+        sshd_exe_path = r'$env:WINDIR\System32\OpenSSH\sshd.exe'
+    return fr'''
+$ErrorActionPreference = "Stop"
+try {{ Set-ExecutionPolicy -Scope CurrentUser Bypass -ErrorAction SilentlyContinue }} catch {{ }}
+Write-Host "========================================" -ForegroundColor Magenta
+Write-Host "OpenSSH Server Installation for Windows" -ForegroundColor Magenta
+Write-Host "========================================" -ForegroundColor Magenta
+{install_method}
+$sshdExePath = "{sshd_exe_path}"
+{configure_sshd_service}
+{configure_firewall}
+{configure_default_shell}
+{configure_ssh_agent}
+{ensure_ssh_directory}
+Write-Host "========================================" -ForegroundColor Magenta
+Write-Host "OpenSSH Server installation complete!" -ForegroundColor Green
+Write-Host "SSH config directory: $env:ProgramData\ssh" -ForegroundColor Cyan
+Write-Host "========================================" -ForegroundColor Magenta
+'''
+
+
+def add_ssh_key(
+    path: Annotated[Optional[str], typer.Option(..., help="Path to the public key file")] = None,
+    choose: Annotated[bool, typer.Option(..., "--choose", "-c", help="Choose from available public keys in ~/.ssh/*.pub")] = False,
+    value: Annotated[bool, typer.Option(..., "--value", "-v", help="Paste the public key content manually")] = False,
+    github: Annotated[Optional[str], typer.Option(..., "--github", "-g", help="Fetch public keys from a GitHub username")] = None,
+) -> None:
+    """🔑 Add SSH public key to this machine so its accessible by owner of corresponding private key."""
+    import machineconfig.scripts.python.helpers.helpers_network.ssh.ssh_add_ssh_key as helper
+    helper.main(pub_path=path, pub_choose=choose, pub_val=value, from_github=github)
+
+
+def add_ssh_identity() -> None:
+    """🗝️ Add SSH identity (private key) to this machine"""
+    import machineconfig.scripts.python.helpers.helpers_network.ssh.ssh_add_identity as helper
+    helper.main()
+
+
+def debug_ssh() -> None:
+    """🐛 Debug SSH connection"""
+    from platform import system
+    if system() == "Linux" or system() == "Darwin":
+        import machineconfig.scripts.python.helpers.helpers_network.ssh.ssh_debug_linux as helper
+        helper.ssh_debug_linux()
+    elif system() == "Windows":
+        import machineconfig.scripts.python.helpers.helpers_network.ssh.ssh_debug_windows as helper
+        helper.ssh_debug_windows()
+    else:
+        print(f"❌ Error: Platform {system()} is not supported.")
+        raise typer.Exit(code=1)
+
+
+def get_app() -> typer.Typer:
+    ssh_app = typer.Typer(help="🔐 SSH subcommands", no_args_is_help=True, add_help_option=True, add_completion=False)
+    ssh_app.command(name="install-server", help="📡 [i] Install SSH server")(install_ssh_server)
+    ssh_app.command(name="i", help="Install SSH server", hidden=True)(install_ssh_server)
+    ssh_app.command(name="change-port", help="🔌 [p] Change SSH port (Linux/WSL only)")(change_ssh_port)
+    ssh_app.command(name="p", help="Change SSH port", hidden=True)(change_ssh_port)
+    ssh_app.command(name="add-key", help="🔑 [k] Add SSH public key to this machine", no_args_is_help=True)(add_ssh_key)
+    ssh_app.command(name="k", help="Add SSH public key to this machine", hidden=True, no_args_is_help=True)(add_ssh_key)
+    ssh_app.command(name="add-identity", help="🗝️ [A] Add SSH identity (private key) to this machine")(add_ssh_identity)
+    ssh_app.command(name="A", help="Add SSH identity (private key) to this machine", hidden=True)(add_ssh_identity)
+    ssh_app.command(name="debug", help="🐛 [d] Debug SSH connection")(debug_ssh)
+    ssh_app.command(name="d", help="Debug SSH connection", hidden=True)(debug_ssh)
+    return ssh_app

machineconfig/scripts/python/{helpers_devops → helpers/helpers_devops}/devops_status.py

@@ -11,7 +11,7 @@ from rich.table import Table
 from rich.text import Text
 
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH, LIBRARY_ROOT
+from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
 
 
 console = Console()
@@ -137,7 +137,7 @@ def _check_config_files_status() -> dict[str, Any]:
     from machineconfig.profile.create_links import read_mapper
 
     try:
-        mapper = read_mapper()
+        mapper = read_mapper(repo="library")
         public_configs = list(mapper.get("public", {}).keys())
         private_configs = list(mapper.get("private", {}).keys())
 
@@ -205,10 +205,16 @@ def _check_backup_config() -> dict[str, Any]:
         cloud_config = "Not configured"
 
     try:
-        backup_file = LIBRARY_ROOT.joinpath("profile/backup.toml")
+        from machineconfig.scripts.python.helpers.helpers_devops.backup_config import LIBRARY_BACKUP_PATH
+        backup_file = LIBRARY_BACKUP_PATH
         if backup_file.exists():
             backup_data = tomllib.loads(backup_file.read_text(encoding="utf-8"))
-            backup_items = list(backup_data.keys())
+            backup_items: list[str] = []
+            for group_name, entries in backup_data.items():
+                if isinstance(entries, dict):
+                    backup_items.extend([f"{group_name}.{entry_name}" for entry_name in entries.keys()])
+                else:
+                    backup_items.append(str(group_name))
             backup_items_count = len(backup_items)
         else:
             backup_items = []
@@ -466,8 +472,8 @@ def main() -> None:
     console.print("\n")
     
     # system_info = _check_system_info()
-    # from machineconfig.scripts.python.helpers_devops.devops_system_info import _check_system_info
-    from machineconfig.scripts.python.helpers_utils.path import get_machine_specs
+    # from machineconfig.scripts.python.helpers.helpers_devops.devops_system_info import _check_system_info
+    from machineconfig.scripts.python.helpers.helpers_utils.python import get_machine_specs
     system_info = get_machine_specs()
     from typing import cast
     system_info = cast(dict[str, str], system_info)

machineconfig/scripts/python/{helpers_devops → helpers/helpers_devops}/devops_update_repos.py

@@ -9,7 +9,7 @@ from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
 
-from machineconfig.scripts.python.helpers_repos.update import RepositoryUpdateResult, run_uv_sync, update_repository
+from machineconfig.scripts.python.helpers.helpers_repos.update import RepositoryUpdateResult, run_uv_sync, update_repository
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 

machineconfig/scripts/python/{interactive.py → helpers/helpers_devops/interactive.py}

@@ -2,17 +2,6 @@
 """
 Interactive Machine Configuration Setup Script
 
-A Python version of the interactive installation script that uses questionary
-for better user experience with checkbox selections.
-
-
-# echo # 📧 Thunderbird Setup Note:
-# Run after installing Thunderbird and starting it once:
-# cd ~/AppData/Roaming/ThunderBird/Profiles
-# $res = ls
-# $name = $res[0].Name
-# mv $backup_folder $name
-#
 
 
 """
@@ -63,31 +52,6 @@ def display_header() -> None:
     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")
-    console.print(Panel(f"✨ {completion_text}\n{subtitle_text}\n\n🎉 Your system has been configured successfully!\n🔄 You may need to reboot to apply all changes.", border_style="green", padding=(1, 2)))
-def display_dotfiles_instructions() -> None:
-    header_text = Text("DOTFILES MIGRATION", style="bold yellow")
-    subtitle_text = Text("Configuration transfer options", style="italic yellow")
-    instructions = """
-🖱️  [bold blue]Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE[/bold blue]
-    On original machine, run:
-    [dim]cd ~/dotfiles/creds/msc
-    easy-sharing . --password rew --username al[/dim]
-    Then open brave on new machine to get MouseWithoutBorders password
-
-🔐 [bold blue]Method 2: USING SSH[/bold blue]
-    FROM REMOTE, RUN:
-    [dim]fptx ~/dotfiles $USER@$(hostname):^ -z
-    # OR, using IP address if router has not yet found the hostname:
-    fptx ~/dotfiles $USER@$(hostname -I | awk '{print $1}'):^ -z[/dim]
-
-☁️  [bold blue]Method 3: USING INTERNET SECURE SHARE[/bold blue]
-    [dim]cd ~
-    cloud_copy SHARE_URL . --config ss[/dim]
-    (requires symlinks to be created first)"""
-    console.print(Panel(f"📂 {header_text}\n{subtitle_text}\n\n{instructions}", border_style="yellow", padding=(1, 2)))
 
 
 def get_installation_choices() -> list[str]:
@@ -117,12 +81,12 @@ def execute_installations(selected_options: list[str]) -> None:
             except Exception as e:
                 console.print(f"❌ Error installing CLI applications: {e}", style="bold red")
             if platform.system() != "Windows":
-                run_shell_script(". $HOME/.bashrc")
+                run_shell_script(". $HOME/.bashrc", display_script=True, clean_env=False)
 
     if "install_machineconfig" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        from machineconfig.scripts.python.helpers_devops.cli_self import install
-        install()
+        from machineconfig.scripts.python.helpers.helpers_devops.cli_self import install
+        install(copy_assets=True, dev=False)
 
     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"))
@@ -131,9 +95,9 @@ def execute_installations(selected_options: list[str]) -> None:
 Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
 Start-Service sshd
 Set-Service -Name sshd -StartupType 'Automatic'"""
-            run_shell_script(f'powershell -Command "{powershell_script}"')
+            run_shell_script(f'powershell -Command "{powershell_script}"', display_script=True, clean_env=False)
         else:
-            run_shell_script("sudo nala install openssh-server -y")
+            run_shell_script("sudo nala install openssh-server -y", display_script=True, clean_env=False)
 
     if "install_shell_profile" in selected_options:
         console.print(Panel("🐚 [bold green]SHELL PROFILE[/bold green]\n[italic]Shell configuration setup[/italic]", border_style="green"))
@@ -142,27 +106,71 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
             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)
+            from machineconfig.profile.create_links_export import main_from_parser
+            main_from_parser(sensitivity="public", method="copy", on_conflict="overwrite-default-path", which="all")
             if platform.system() == "Windows":
-                from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
+                from machineconfig.jobs.installer.python_scripts.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
+                from machineconfig.settings.wt.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 "retrieve_repositories" in selected_options or "retrieve_data" in selected_options:
+        # we cannot proceed before dotfiles are in place
+        if Path.home().joinpath("dotfiles").exists():
+            console.print("✅ Dotfiles directory found.", style="bold green")
+        else:
+            header_text = Text("DOTFILES MIGRATION", style="bold yellow")
+            subtitle_text = Text("Configuration transfer options", style="italic yellow")
+            instructions = """
+            On remote, run:
+            devops config export-dotfiles --password pwd
+            On new machine, run:
+            devops config import-dotfiles --password pwd
+            """
+            console.print(Panel(f"📂 {header_text}\n{subtitle_text}\n\n{instructions}", border_style="yellow", padding=(1, 2)))
+            i_sorted_it_out = "I have sorted out dotfiles migration already and want to proceed."
+            exit_now = "Exit now and sort out dotfiles migration first."
+            fetch_over_lan = "I already exposed dotfiles over LAN, let's fetch them now."
+            fetch_over_ssh = "I wanted to bring them using SSH SCP now."
+            options: list[str] = [
+                i_sorted_it_out,
+                exit_now,
+                fetch_over_lan,
+                fetch_over_ssh,
+            ]
+            answer = questionary.select("⚠️  DOTFILES NOT FOUND. How do you want to proceed?", choices=options).ask()
+            if answer == i_sorted_it_out:
+                console.print("✅ Proceeding as per user confirmation.", style="bold green")
+            elif answer == exit_now:
+                console.print("❌ Exiting for dotfiles migration.", style="bold red")
+                sys.exit(0)
+            elif answer == fetch_over_lan:
+                from machineconfig.scripts.python.helpers.helpers_devops.cli_config_dotfile import import_dotfiles
+                import_dotfiles(use_ssh=False)
+            elif answer == fetch_over_ssh:
+                from machineconfig.scripts.python.helpers.helpers_devops.cli_config_dotfile import import_dotfiles
+                import_dotfiles(use_ssh=True)
+            if not Path.home().joinpath("dotfiles").exists():
+                console.print("❌ Dotfiles directory still not found after attempted import. Exiting...", style="bold red")
+                sys.exit(1)
+            # devops config sync --sensitivity public --method symlink --on-conflict overwrite-default-path --which all
+            # devops config sync --sensitivity private --method symlink --on-conflict overwrite-default-path --which all
+            from machineconfig.profile.create_links_export import main_from_parser
+            main_from_parser(sensitivity="private", method="symlink", on_conflict="overwrite-default-path", which="all")
+
     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.helpers_devops import cli_repos
-        cli_repos.clone(directory=str(Path.home() / "code"), cloud="odg1")
+        from machineconfig.scripts.python.helpers.helpers_devops import cli_repos
+        cli_repos.clone(interactive=True)
 
     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.helpers_devops.devops_backup_retrieve import main_backup_retrieve
-            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None)
+            from machineconfig.scripts.python.helpers.helpers_devops.cli_backup_retrieve import main_backup_retrieve
+            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None, repo="all")
             console.print("✅ Backup data retrieved successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")
@@ -180,7 +188,13 @@ def main() -> None:
         console.print("❌ Installation cancelled.", style="bold red")
         sys.exit(0)
     execute_installations(selected_options=selected_options)
-    display_completion_message()
+    completion_text = Text("INSTALLATION COMPLETE", style="bold green")
+    subtitle_text = Text("System setup finished successfully", style="italic green")
+    console.print(Panel(f"✨ {completion_text}\n{subtitle_text}\n\n🎉 Your system has been configured successfully!\n🔄 You may need to reboot to apply all changes.", border_style="green", padding=(1, 2)))
+
+    from machineconfig.profile.create_shell_profile import reload_shell_profile_and_exit
+    reload_shell_profile_and_exit()
+
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/helpers/helpers_devops/mount_helpers/commands.py

@@ -0,0 +1,25 @@
+import subprocess
+
+
+def run_command(command: list[str]) -> subprocess.CompletedProcess[str]:
+	result = subprocess.run(command, capture_output=True, text=True, check=False)
+	return result
+
+
+def run_command_sudo(command: list[str]) -> subprocess.CompletedProcess[str]:
+	result = subprocess.run(["sudo", *command], capture_output=True, text=True, check=False)
+	return result
+
+
+def run_powershell(command: str) -> subprocess.CompletedProcess[str]:
+	result = subprocess.run(["powershell", "-NoProfile", "-Command", command], capture_output=True, text=True, check=False)
+	return result
+
+
+def ensure_ok(result: subprocess.CompletedProcess[str], context: str) -> str:
+	if result.returncode != 0:
+		stderr_value = result.stderr.strip()
+		stdout_value = result.stdout.strip()
+		error_text = stderr_value if stderr_value != "" else stdout_value
+		raise RuntimeError(f"{context} failed: {error_text}")
+	return result.stdout