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

machineconfig/scripts/python/devops.py

@@ -1,22 +1,18 @@
 """devops with emojis"""
 
-from machineconfig.utils.options import choose_from_options
+from machineconfig.scripts.python.share_terminal import main as share_terminal_main
+import machineconfig.scripts.python.devops_devapps_install as installer_entry_point
 
 from platform import system
-from typing import Optional, Literal, TypeAlias
 from rich.console import Console
 from rich.panel import Panel
 import typer
 
 console = Console()
-app = typer.Typer(help="🛠️ DevOps operations with emojis", invoke_without_command=True, no_args_is_help=True)
+app = typer.Typer(help="🛠️ DevOps operations with emojis", no_args_is_help=True)
 
-BOX_WIDTH = 150  # width for box drawing
-
-
-COMMANDS: TypeAlias = Literal["🔄 UPDATE essential repos", "⚙️ DEVAPPS install", "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS.", "🆕 SYMLINKS new", "🔑 SSH add pub key to this machine", "🗝️ SSH add identity (private key) to this machine", "🔐 SSH use key pair to connect two machines", "📡 SSH setup", "🐧 SSH setup wsl", "💾 BACKUP", "📥 RETRIEVE", "⏰ SCHEDULER"]
 
-options_list = list(COMMANDS.__args__)
+BOX_WIDTH = 150  # width for box drawing
 
 
 @app.command()
@@ -27,12 +23,9 @@ def update():
     helper.main()
 
 
-@app.command()
-def install():
-    """⚙️ DEVAPPS install"""
-    console.print(Panel("⚙️  Installing development applications...", width=BOX_WIDTH, border_style="blue"))
-    import machineconfig.scripts.python.devops_devapps_install as helper
-    helper.main(which=None)
+app.command(name="install", help="📦 Install essential packages")(installer_entry_point.main)
+app.command(name="share-terminal", help="📡 Share terminal via web browser")(share_terminal_main)
+
 
 
 @app.command()
@@ -123,55 +116,12 @@ def scheduler():
     # from machineconfig.scripts.python.scheduler import main as helper
     # helper()
 
-
-def args_parser():
-    app()
-
-
-@app.command()
-def interactive(which: Optional[COMMANDS] = None):
-    """🛠️ Interactive menu mode (legacy)"""
-    console.print(Panel("🚀 Initializing DevOps operation...", width=BOX_WIDTH, border_style="blue"))
-    options = options_list
-    if which is None:
-        try:
-            choice_key = choose_from_options(msg="", options=options, header="🛠️ DEVOPS", default=options[0], multi=False, fzf=False)
-        except KeyboardInterrupt:
-            console.print(Panel("❌ Operation cancelled by user", title_align="left", border_style="red", width=BOX_WIDTH))
-            return
-    else:
-        choice_key = which
-
-    console.print(Panel(f"🔧 SELECTED OPERATION\n{choice_key}", title_align="left", border_style="green", width=BOX_WIDTH))
-
-    if choice_key == "🔄 UPDATE essential repos":
-        update()
-    elif choice_key == "⚙️ DEVAPPS install":
-        install()
-    elif choice_key == "🆕 SYMLINKS new":
-        symlinks_new()
-    elif choice_key == "🔗 SYMLINKS, SHELL PROFILE, FONT, TERMINAL SETTINGS.":
-        symlinks()
-    elif choice_key == "🔑 SSH add pub key to this machine":
-        ssh_add_key()
-    elif choice_key == "🔐 SSH use key pair to connect two machines":
-        ssh_connect()
-    elif choice_key == "🗝️ SSH add identity (private key) to this machine":
-        ssh_add_identity()
-    elif choice_key == "📡 SSH setup":
-        ssh_setup()
-    elif choice_key == "🐧 SSH setup wsl":
-        ssh_setup_wsl()
-    elif choice_key == "💾 BACKUP":
-        backup()
-    elif choice_key == "📥 RETRIEVE":
-        retrieve()
-    elif choice_key == "⏰ SCHEDULER":
-        scheduler()
-    else:
-        console.print(Panel("❌ ERROR: Invalid choice", title_align="left", border_style="red", width=BOX_WIDTH))
-        raise ValueError(f"Unimplemented choice: {choice_key}")
+@app.command("ia")
+def interactive():
+    """🤖 INTERACTIVE configuration of machine."""
+    from machineconfig.scripts.python.interactive import main
+    main()
 
 
 if __name__ == "__main__":
-    args_parser()
+    pass

machineconfig/scripts/python/devops_devapps_install.py

@@ -1,16 +1,11 @@
 """Devops Devapps Install"""
 
-# import subprocess
 import typer
 from rich.progress import Progress, SpinnerColumn, TextColumn
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.options import choose_from_options
-from machineconfig.utils.installer import get_installers, install_all
-from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
 from platform import system
-from typing import Any, Optional, Literal, TypeAlias, get_args, Annotated
+from typing import Optional, Literal, TypeAlias, cast, get_args, Annotated
 
-WHICH_CAT: TypeAlias = Literal["essentials", "essentialsDev", "systymPackages", "precheckedPackages"]
+WHICH_CAT: TypeAlias = Literal["essentials", "essentialsDev", "systymPackages", "precheckedPackages", "ia"]
 
 
 def main_with_parser():
@@ -20,11 +15,12 @@ def main_with_parser():
     app()
 
 
-def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category or program to install, {list(get_args(WHICH_CAT))} or <program_name>")]) -> None:
-    if which is not None and which in get_args(WHICH_CAT):  # install by category
+def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category or program to install, {list(get_args(WHICH_CAT))} or <program_name> or list of programs names separated by comma.")]) -> None:
+    if which in get_args(WHICH_CAT):  # install by category
         return get_programs_by_category(program_name=which)  # type: ignore
-
-    if which is not None:  # install by name
+    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+    from machineconfig.utils.installer import get_installers
+    if which != "ia" and which is not None:  # install by name
         total_messages: list[str] = []
         for a_which in which.split(",") if type(which) == str else which:
             all_installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL", "GITHUB_DEV", "CUSTOM_DEV"])
@@ -53,6 +49,12 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
             print(a_message)
         return None
 
+
+
+def install_interactively():
+    from machineconfig.utils.options import choose_from_options
+    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+    from machineconfig.utils.installer import get_installers
     installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL", "GITHUB_DEV", "CUSTOM_DEV"])
     # Check installed programs with progress indicator
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}")) as progress:
@@ -84,8 +86,7 @@ def main(which: Annotated[Optional[str], typer.Argument(help=f"Choose a category
         if a_program_name.startswith("📦 "):
             category_name = a_program_name[2:]  # Remove "📦 " prefix
             if category_name in get_args(WHICH_CAT):
-                shell_commands = get_programs_by_category(program_name=category_name)  # type: ignore
-                total_commands += "\n" + shell_commands
+                get_programs_by_category(program_name=cast(WHICH_CAT, category_name))
         else:
             # Handle individual installer options
             installer_idx = installer_options.index(a_program_name)
@@ -112,15 +113,18 @@ def get_programs_by_category(program_name: WHICH_CAT):
 ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 ┃ 📦 Installing Category: {program_name}
 ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━""")
+    from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+    from machineconfig.utils.installer import get_installers, install_all
+    from machineconfig.utils.installer_utils.installer_abc import parse_apps_installer_linux, parse_apps_installer_windows
+    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
+    from machineconfig.utils.options import choose_from_options
     match program_name:
         case "essentials":
             installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL"])
             install_all(installers=installers_)
-            program = ""
         case "essentialsDev":
             installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["GITHUB_DEV", "CUSTOM_DEV", "GITHUB_ESSENTIAL", "CUSTOM_ESSENTIAL"])
             install_all(installers=installers_)
-            program = ""
         case "systymPackages":
             if system() == "Windows":
                 options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
@@ -141,79 +145,14 @@ def get_programs_by_category(program_name: WHICH_CAT):
                 if sub_program.startswith("#winget"):
                     sub_program = sub_program[1:]
                 program += "\n" + sub_program
-        # case "CHOOSE": raise NotImplementedError("CHOOSE is not implemented yet.")
-        # case "OtherDevApps":
-        #     installers = get_installers(dev=True, system=system())
-        #     options__: list[str] = [x.get_description() for x in tqdm(installers, desc="Checking installed programs")]
-        #     program_names = choose_from_options(multi=True, msg="", options=sorted(options__) + ["all"], header="CHOOSE DEV APP")
-        #     if "all" in program_names: program_names = options__
-        #     program = ""
-        #     print("Installing:")
-        #     L(program_names).print()
-        #     for name in program_names:
-        #         try:
-        #             idx = options__.index(name)
-        #         except ValueError as ve:
-        #             print(f"{name=}")
-        #             print(f"{options__=}")
-        #             raise ve
-        #         print(f"Installing {name}")
-        #         sub_program = installers[idx].install_robust(version=None)  # finish the task
-
+        case "ia":
+            install_interactively()
         case "precheckedPackages":
             # from machineconfig.jobs.python.check_installations import precheckedPackages
             # ci = precheckedPackages()
             # ci.download_safe_apps(name="essentials")
             # program = ""
             raise NotImplementedError("precheckedPackages is not implemented yet.")
-    return program
-
-
-def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
-    txts = txt.split("""yes '' | sed 3q; echo "----------------------------- installing """)
-    res = {}
-    for chunk in txts[1:]:
-        try:
-            k = chunk.split("----")[0].rstrip().lstrip()
-            v = "\n".join(chunk.split("\n")[1:])
-            res[k] = v
-        except IndexError as e:
-            print(f"""
-❌ Error parsing chunk:
-{"-" * 50}
-{chunk}
-{"-" * 50}""")
-            raise e
-    return res
-
-
-def parse_apps_installer_windows(txt: str) -> dict[str, Any]:
-    chunks: list[str] = []
-    for idx, item in enumerate(txt.split(sep="winget install")):
-        if idx == 0:
-            continue
-        if idx == 1:
-            chunks.append(item)
-        else:
-            chunks.append("winget install" + item)
-    # progs = L(txt.splitlines()).filter(lambda x: x.startswith("winget ") or x.startswith("#winget"))
-    res: dict[str, str] = {}
-    for a_chunk in chunks:
-        try:
-            name = a_chunk.split("--name ")[1]
-            if "--Id" not in name:
-                print(f"⚠️  Warning: {name} does not have an Id, skipping")
-                continue
-            name = name.split(" --Id ", maxsplit=1)[0].strip('"').strip('"')
-            res[name] = a_chunk
-        except IndexError as e:
-            print(f"""
-❌ Error parsing chunk:
-{"-" * 50}
-{a_chunk}
-{"-" * 50}""")
-            raise e
-    return res
 
 
 if __name__ == "__main__":

machineconfig/scripts/python/interactive.py

@@ -19,6 +19,8 @@ for better user experience with checkbox selections.
 
 import subprocess
 import sys
+from pathlib import Path
+from platform import system
 
 import questionary
 from questionary import Choice
@@ -39,36 +41,23 @@ def run_command(command: str, description: str) -> bool:
     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)
-    ))
-
-
+    console.print(Panel(f"📦 {header_text}\n{subtitle_text}", border_style="blue", padding=(1, 2)))
 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)
-    ))
-
-
+    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]
+
+    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]
@@ -84,172 +73,194 @@ 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(
-        f"📂 {header_text}\n{subtitle_text}\n\n{instructions}",
-        border_style="yellow",
-        padding=(1, 2)
-    ))
+    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 UV and Repos           - Set up Python environment and repositories", 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="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="retrieve_data", title="💾 Retrieve Data                  - Backup restoration", checked=False),
+        Choice(value="install_ascii_art", title="🎨 Install ASCII Art Libraries    - Terminal visualization tools", checked=False),
     ]
-    
-    selected = questionary.checkbox(
-        "Select the installation options you want to execute:",
-        choices=choices,
-        show_description=True,
-    ).ask()
-    
+    # 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"
-    )
-    
+    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"
-        ))
-        run_command(
-            "curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/apps.sh | bash",
-            "Installing base system applications"
-        )
-    
+        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"
-        ))
+        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")
-    
+
     if "install_uv_repos" in selected_options:
-        console.print(Panel(
-            "🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]",
-            border_style="green"
-        ))
-        run_command(
-            "curl https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/repos.sh | bash",
-            "Setting up Python environment and repositories"
-        )
-    
+        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")
+
     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"
-        ))
-        run_command("sudo nala install openssh-server -y", "Installing SSH server")
-    
-    # Always display dotfiles instructions if symlinks are selected
+        console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
+        if 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()
-        
+        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"
-            ))
-            run_command(
-                "uv run --python 3.13 --with machineconfig python -m fire machineconfig.profile.create main_symlinks --choice=all",
-                "Creating symlinks"
-            )
+            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")
         else:
             console.print("⏭️  Skipping symlink creation - finish dotfiles transfer first", style="yellow")
-    
+
     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"
-        ))
-        run_command(
-            "uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=essentials",
-            "Installing CLI applications"
-        )
+        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.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")
+        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"
-        )
+        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")
-        run_command(
-            "uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main --which=wezterm,brave,code",
-            "Installing development applications"
-        )
-    
+        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")
+
     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"
-        ))
-        run_command("repos ~/code --clone --cloud odg1", "Cloning repositories")
-    
+        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")
+
     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"
-        ))
-        run_command(
-            "uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE",
-            "Retrieving backup data"
-        )
-    
+        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")
+            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"
-        ))
-        run_command("curl bit.ly/cfgasciiartlinux -L | sudo bash", "Installing ASCII art libraries")
+        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()    
+    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")
-    proceed = questionary.confirm("🚀 Proceed with installation?", default=True).ask()    
+    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)
     display_completion_message()
 
 

machineconfig/scripts/python/repos.py

@@ -60,7 +60,6 @@ def main(
         clone_repos(spec_path=repos_root, preferred_remote=None, checkout_branch_flag=checkout_to_branch, checkout_commit_flag=checkout)
 
     elif all or commit or pull or push:
-        # Use the new helper function for git operations
         perform_git_operations(
             repos_root=repos_root,
             pull=pull or all,