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

machineconfig/scripts/python/helpers_utils/download.py

@@ -0,0 +1,152 @@
+
+
+from typing import Annotated, Optional
+import typer
+from pathlib import Path
+
+
+def download(
+    url: Annotated[Optional[str], typer.Argument(..., help="The URL to download the file from.")] = None,
+    decompress: Annotated[bool, typer.Option(..., "--decompress", "-d", help="Decompress the file if it's an archive.")] = False,
+    output: Annotated[Optional[str], typer.Option("--output", "-o", help="The output file path.")] = None,
+    output_dir: Annotated[Optional[str], typer.Option("--output-dir", help="Directory to place the downloaded file in.")] = None,
+) -> Optional["Path"]:
+
+    import subprocess
+    from urllib.parse import parse_qs, unquote, urlparse
+    from requests import Response
+    import requests
+    from pathlib import Path
+    if url is None:
+        typer.echo("❌ Error: URL is required.", err=True)
+        return None
+    if output is not None and output_dir is not None:
+        typer.echo("❌ Error: --output and --output-dir cannot be used together.", err=True)
+        return None
+    typer.echo(f"📥 Downloading from: {url}")
+
+    def _sanitize_candidate_filename(name: str) -> Optional[str]:
+        candidate = Path(name).name.strip()
+        if not candidate or candidate in {".", ".."}:
+            return None
+        return candidate
+
+    def _filename_from_content_disposition(header_value: Optional[str]) -> Optional[str]:
+        if header_value is None:
+            return None
+        parts = [segment.strip() for segment in header_value.split(";")]
+        for part in parts:
+            lower = part.lower()
+            if lower.startswith("filename*="):
+                value = part.split("=", 1)[1]
+                value = value.strip().strip('"')
+                if "''" in value:
+                    value = value.split("''", 1)[1]
+                decoded = unquote(value)
+                sanitized = _sanitize_candidate_filename(decoded)
+                if sanitized is not None:
+                    return sanitized
+            if lower.startswith("filename="):
+                value = part.split("=", 1)[1].strip().strip('"')
+                decoded = unquote(value)
+                sanitized = _sanitize_candidate_filename(decoded)
+                if sanitized is not None:
+                    return sanitized
+        return None
+
+    def _filename_from_url(source_url: str) -> Optional[str]:
+        parsed = urlparse(source_url)
+        url_candidate = _sanitize_candidate_filename(unquote(Path(parsed.path).name))
+        if url_candidate is not None:
+            return url_candidate
+        query_params = parse_qs(parsed.query, keep_blank_values=True)
+        for key, values in query_params.items():
+            lower_key = key.lower()
+            if "name" in lower_key or "file" in lower_key:
+                for value in values:
+                    sanitized = _sanitize_candidate_filename(unquote(value))
+                    if sanitized is not None:
+                        return sanitized
+        return None
+
+    def _resolve_download_path(request_url: str, response: Response, requested_output: Optional[str], requested_output_dir: Optional[str]) -> Path:
+        if requested_output is not None:
+            return Path(requested_output)
+        header_candidate = _filename_from_content_disposition(response.headers.get("content-disposition"))
+        if header_candidate is None:
+            header_candidate = _filename_from_url(response.url)
+        if header_candidate is None:
+            header_candidate = _filename_from_url(request_url)
+        if header_candidate is None:
+            header_candidate = "downloaded_file"
+        if requested_output_dir is not None:
+            return Path(requested_output_dir) / header_candidate
+        return Path(header_candidate)
+
+    try:
+        with requests.get(url, allow_redirects=True, stream=True, timeout=60) as response:
+            response.raise_for_status()
+            download_path = _resolve_download_path(url, response, output, output_dir)
+            download_path.parent.mkdir(parents=True, exist_ok=True)
+            total_size_header = response.headers.get("content-length", "0")
+            try:
+                total_size = int(total_size_header)
+            except (TypeError, ValueError):
+                total_size = 0
+            if total_size <= 0:
+                with open(download_path, "wb") as file_handle:
+                    file_handle.write(response.content)
+            else:
+                downloaded = 0
+                chunk_size = 8192 * 4
+                with open(download_path, "wb") as file_handle:
+                    for chunk in response.iter_content(chunk_size=chunk_size):
+                        if not chunk:
+                            continue
+                        file_handle.write(chunk)
+                        downloaded += len(chunk)
+                        progress = (downloaded / total_size) * 100
+                        typer.echo(f"\r⏬ Progress: {progress:.1f}% ({downloaded}/{total_size} bytes)", nl=False)
+                typer.echo()
+    except requests.exceptions.RequestException as exception:
+        typer.echo(f"❌ Download failed: {exception}", err=True)
+        return None
+    except OSError as exception:
+        typer.echo(f"❌ File write error: {exception}", err=True)
+        return None
+
+    typer.echo(f"✅ Downloaded to: {download_path}")
+    result_path: Path = download_path
+
+    if decompress:
+        typer.echo(f"📦 Decompressing: {download_path}")
+        base_name = download_path.stem
+        if base_name in {"", ".", ".."}:
+            base_name = "extracted"
+        extract_dir = download_path.parent / base_name
+        extract_dir.mkdir(parents=True, exist_ok=True)
+        try:
+            subprocess.run(
+                ["ouch", "decompress", str(download_path), "--dir", str(extract_dir)],
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+            typer.echo(f"✅ Decompressed to: {extract_dir}")
+            if download_path.exists():
+                download_path.unlink()
+                typer.echo(f"🗑️  Removed archive: {download_path}")
+            result_path = extract_dir
+        except subprocess.CalledProcessError as exception:
+            typer.echo(f"❌ Decompression failed: {exception.stderr}", err=True)
+            return None
+        except FileNotFoundError:
+            typer.echo("❌ Error: ouch command not found. Please install ouch.", err=True)
+            typer.echo("💡 Install with: cargo install ouch", err=True)
+            return None
+
+    return result_path.resolve()
+
+
+if __name__ == "__main__":
+    pass

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

@@ -17,45 +17,59 @@ for better user experience with checkbox selections.
 
 """
 
-import subprocess
 import sys
 from pathlib import Path
-from platform import system
-
+import platform
 import questionary
 from questionary import Choice
 from rich.console import Console
 from rich.panel import Panel
 from rich.text import Text
-
+from machineconfig.utils.code import run_shell_script
 
 console = Console()
 
 
-def run_command(command: str, description: str) -> bool:
-    """Execute a shell command and return success status."""
-    console.print(f"\n🔧 {description}", style="bold cyan")
-    try:
-        result = subprocess.run(command, shell=True, check=True, capture_output=False)
-        return result.returncode == 0
-    except subprocess.CalledProcessError as e:
-        console.print(f"❌ Error executing command: {e}", style="bold red")
-        return False
 def display_header() -> None:
-    """Display the script header."""
-    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:
-    """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)))
 def display_dotfiles_instructions() -> None:
-    """Display instructions for dotfiles migration."""
     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:
@@ -73,194 +87,99 @@ def display_dotfiles_instructions() -> None:
     [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 install_windows_desktop_apps() -> bool:
-    """Install Windows desktop applications using winget."""
-    if system() != "Windows":
-        console.print("❌ This function is only available on Windows systems.", style="bold red")
-        return False
-    
-    console.print(Panel("💻 [bold cyan]WINDOWS DESKTOP APPS[/bold cyan]\n[italic]Installing Brave, Windows Terminal, PowerShell, and VSCode[/italic]", border_style="cyan"))
-    
-    # Install winget applications
-    winget_commands = [
-        ('winget install --no-upgrade --name "Windows Terminal" --Id "Microsoft.WindowsTerminal" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing Windows Terminal"),
-        ('winget install --no-upgrade --name "Powershell" --Id "Microsoft.PowerShell" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing PowerShell"),
-        ('winget install --no-upgrade --name "Brave" --Id "Brave.Brave" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing Brave Browser"),
-        ('winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements', "Installing Visual Studio Code"),
-    ]
-    
-    success = True
-    for command, description in winget_commands:
-        if not run_command(command, description):
-            success = False
-    
-    # Install Nerd Fonts via Python
-    console.print("🔧 Installing Nerd Fonts", style="bold cyan")
-    try:
-        from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
-        install_nerd_fonts()
-        console.print("✅ Nerd Fonts installed successfully", style="bold green")
-    except Exception as e:
-        console.print(f"❌ Error installing Nerd Fonts: {e}", style="bold red")
-        success = False
-    
-    # Set Windows Terminal settings via Python
-    console.print("🔧 Setting Windows Terminal settings", style="bold cyan")
-    try:
-        from machineconfig.setup_windows.wt_and_pwsh.set_wt_settings import main as set_wt_settings_main
-        set_wt_settings_main()
-        console.print("✅ Windows Terminal settings configured successfully", style="bold green")
-    except Exception as e:
-        console.print(f"❌ Error setting Windows Terminal settings: {e}", style="bold red")
-        success = False
-    
-    return success
-
-
 def get_installation_choices() -> list[str]:
     """Get user choices for installation options."""
     choices = [
-        Choice(value="install_apps", title="📥 Install Apps                    - Install base system applications", checked=False),
-        Choice(value="upgrade_system", title="🔄 Upgrade System Packages        - Update all system packages", checked=False),
-        Choice(value="install_uv_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="create_symlinks", title="🔗 Create Symlinks                - Set up configuration symlinks (finish dotfiles transfer first)", checked=False),
-        Choice(value="install_cli_apps", title="⚡ Install CLI Apps               - Command-line tools installation", checked=False),
-        Choice(value="install_dev_tools", title="🛠️  Install Development Tools      - rust, libssl-dev, ffmpeg, wezterm, brave, code", 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_ascii_art", title="🎨 Install ASCII Art Libraries    - Terminal visualization tools", 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:
-    """Execute the selected installation options."""
-    # Always start with VE setup
-    console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Setting up base virtual environment[/italic]", border_style="green"))
-    run_command("curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/ve.sh | bash", "Setting up base virtual environment")
-
-    if "install_apps" in selected_options:
-        console.print(Panel("📦 [bold blue]APPLICATIONS[/bold blue]\n[italic]Installing base system applications[/italic]", border_style="blue"))
-        if system() == "Windows":
-            # Windows: Use PowerShell to execute local apps.ps1 script
-            from machineconfig import setup_windows as module
-            script = Path(module.__file__).parent / "apps.ps1"
-            run_command(f'powershell -ExecutionPolicy Bypass -File "{script}"', "Installing Windows applications")
-        else:
-            # Linux: Use existing bash script approach
-            from machineconfig import setup_linux as module
-            script = Path(module.__file__).parent / "apps.sh"
-            run_command(f"bash {script}", "Installing Linux base system applications")
-
-    if "upgrade_system" in selected_options:
-        console.print(Panel("🔄 [bold magenta]SYSTEM UPDATE[/bold magenta]\n[italic]Package management[/italic]", border_style="magenta"))
-        run_command("sudo nala upgrade -y", "Upgrading system packages")
+    for maybe_a_group in selected_options:
+        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_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")
+            if platform.system() != "Windows":
+                run_shell_script(". $HOME/.bashrc")
 
-    if "install_uv_repos" in selected_options:
+    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 import setup_linux as module
-        script = Path(module.__file__).parent / "repos.sh"
-        run_command(f"bash {script}", "Setting up Python environment and repositories")
+        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
 Set-Service -Name sshd -StartupType 'Automatic'"""
-            run_command(f'powershell -Command "{powershell_script}"', "Installing and configuring SSH server")
-        else:
-            run_command("sudo nala install openssh-server -y", "Installing SSH server")
-
-    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_command("sudo chmod 600 $HOME/.ssh/*", "Setting SSH key permissions")
-            run_command("sudo chmod 700 $HOME/.ssh", "Setting SSH directory permissions")
+            run_shell_script(f'powershell -Command "{powershell_script}"')
         else:
-            console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
+            run_shell_script("sudo nala install openssh-server -y")
 
-    if "install_cli_apps" in selected_options:
-        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")
+    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"))
+        console.print("🔧 Configuring shell profile", style="bold cyan")
         try:
-            from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
-            devops_devapps_install_main(which="essentials")
-            console.print("✅ CLI applications installed successfully", style="bold green")
+            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 installing CLI applications: {e}", style="bold red")
-        run_command(". $HOME/.bashrc", "Reloading bash configuration")
-
-    if "install_dev_tools" in selected_options:
-        console.print(Panel("🛠️  [bold bright_blue]DEVELOPMENT TOOLS[/bold bright_blue]\n[italic]Software development packages[/italic]", border_style="bright_blue"))
-        run_command("(curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true", "Installing Rust toolchain")
-        run_command("sudo nala install libssl-dev -y", "Installing libssl-dev")
-        run_command("sudo nala install ffmpeg -y", "Installing ffmpeg")
-        console.print("🔧 Installing development applications", style="bold cyan")
-        try:
-            from machineconfig.scripts.python.devops_devapps_install import main as devops_devapps_install_main
-            devops_devapps_install_main(which="wezterm,brave,code")
-            console.print("✅ Development applications installed successfully", style="bold green")
-        except Exception as e:
-            console.print(f"❌ Error installing development applications: {e}", style="bold red")
+            console.print(f"❌ Error configuring shell profile: {e}", style="bold red")
 
     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 as module
-        module.main(directory=str(Path.home() / "code"), clone=True, 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_ascii_art" in selected_options:
-        console.print(Panel("🎨 [bold bright_green]ASCII ART[/bold bright_green]\n[italic]Terminal visualization tools[/italic]", border_style="bright_green"))
-        from machineconfig import setup_linux as module
-        script = Path(module.__file__).parent / "web_shortcuts" / "ascii_art.sh"
-        run_command(f"bash {script}", "Installing ASCII art libraries")
-
-    if "install_windows_desktop" in selected_options:
-        install_windows_desktop_apps()
-
 
 def main() -> None:
-    """Main function to run the interactive installation."""
     display_header()
     selected_options = get_installation_choices()
     if not selected_options:
         console.print("❌ No options selected. Exiting...", style="bold red")
         sys.exit(0)
-    console.print(f"\n✅ Selected options: {', '.join(selected_options)}", style="bold green")
+    console.print(f"\n✅ Selected options: {'\n'.join(selected_options)}", style="bold green")
     proceed = questionary.confirm("🚀 Proceed with installation?", default=True).ask()
     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()