machineconfig 3.98__tar.gz → 3.99__tar.gz

{machineconfig-3.98/src/machineconfig.egg-info → machineconfig-3.99}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.98
+Version: 3.99
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-3.98 → machineconfig-3.99}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "3.98"
+version = "3.99"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-3.98 → machineconfig-3.99}/src/machineconfig/scripts/python/devops.py

@@ -23,7 +23,7 @@ def update():
     helper.main()
 
 
-app.command(name="install")(installer_entry_point.main)
+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)
 
 
@@ -118,6 +118,7 @@ def scheduler():
 
 @app.command("ia")
 def interactive():
+    """🤖 INTERACTIVE configuration of machine."""
     from machineconfig.scripts.python.interactive import main
     main()
 

{machineconfig-3.98 → machineconfig-3.99}/src/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
@@ -75,6 +77,50 @@ def display_dotfiles_instructions() -> None:
     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 = [
@@ -89,6 +135,9 @@ def get_installation_choices() -> list[str]:
         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),
     ]
+    # 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 []
 
@@ -101,10 +150,16 @@ def execute_installations(selected_options: list[str]) -> None:
 
     if "install_apps" in selected_options:
         console.print(Panel("📦 [bold blue]APPLICATIONS[/bold blue]\n[italic]Installing base system applications[/italic]", border_style="blue"))
-        from machineconfig import setup_linux as module
-        from pathlib import Path
-        script = Path(module.__file__).parent / "apps.sh"
-        run_command(f"bash {script}", "Installing base system applications")
+        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"))
@@ -113,20 +168,32 @@ def execute_installations(selected_options: list[str]) -> None:
     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"))
         from machineconfig import setup_linux as module
-        from pathlib import Path
         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")
+        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()
         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("🔧 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:
@@ -134,7 +201,13 @@ def execute_installations(selected_options: list[str]) -> None:
 
     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("🔧 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:
@@ -142,19 +215,37 @@ def execute_installations(selected_options: list[str]) -> None:
         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")
+        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("🔧 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")
+        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:

{machineconfig-3.98 → machineconfig-3.99}/src/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,

machineconfig-3.99/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -0,0 +1,12 @@
+Write-Host "
+🚀 ===========================================
+📦 Machine Configuration Installation Script
+============================================="
+
+Write-Host "ℹ️  If you have execution policy issues, run: Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
+
+Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/ve.ps1" -OutFile "ve.ps1"
+.\ve.ps1
+rm ve.ps1
+
+uv run --python 3.13 --with machineconfig devops ia

{machineconfig-3.98 → machineconfig-3.99}/src/machineconfig/utils/installer_utils/installer_abc.py

@@ -167,6 +167,33 @@ def check_if_installed_already(exe_name: str, version: Optional[str], use_cache:
 
 
 def parse_apps_installer_linux(txt: str) -> dict[str, Any]:
+    """Parse Linux shell installation scripts into logical chunks.
+    
+    Supports two formats:
+    1. Legacy format with 'yes '' | sed 3q; echo "----------------------------- installing' delimiter
+    2. New format with # --BLOCK:<name>-- comment signatures
+    
+    Returns:
+        dict[str, str]: Dictionary mapping block/section names to their installation scripts
+    """
+    # Try new block format first
+    if "# --BLOCK:" in txt:
+        import re
+        # Split by block signatures: # --BLOCK:<name>--
+        blocks = re.split(r'# --BLOCK:([^-]+)--', txt)
+        res: dict[str, str] = {}
+        
+        # Process blocks in pairs (block_name, block_content)
+        for i in range(1, len(blocks), 2):
+            if i + 1 < len(blocks):
+                block_name = blocks[i].strip()
+                block_content = blocks[i + 1].strip()
+                if block_content:
+                    res[block_name] = block_content
+        
+        return res
+    
+    # Legacy format fallback
     txts = txt.split("""yes '' | sed 3q; echo "----------------------------- installing """)
     res = {}
     for chunk in txts[1:]:

{machineconfig-3.98 → machineconfig-3.99/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 3.98
+Version: 3.99
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

machineconfig-3.98/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -1,191 +0,0 @@
-Write-Host "
-🚀 ===========================================
-📦 Machine Configuration Installation Script
-============================================="
-
-Write-Host "ℹ️  If you have execution policy issues, run:
-Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser"
-Write-Host "💡 To accept all prompts automatically, run: `$yesAll = `$true`n"
-
-
-Write-Host "🔄 Setting up Python environment..."
-Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/ve.ps1" -OutFile "ve.ps1"
-.\ve.ps1
-rm ve.ps1
-
-Write-Host "`n🔄 Setting up repositories..."
-Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/repos.ps1" -OutFile "repos.ps1"
-.\repos.ps1
-rm repos.ps1
-
-Write-Host "`n📂 ============================================
-🔄 DOTFILES MIGRATION OPTIONS
-============================================="
-
-Write-Host "🖱️  Method 1: USING MOUSE WITHOUT KB OR BROWSER SHARE
-    On original machine, run:
-    cd ~/dotfiles/creds/msc
-    easy-sharing . --password rew
-    Then open browser on new machine to get MouseWithoutBorders password"
-
-Write-Host "`n🔐 Method 2: USING SSH
-    FROM REMOTE, RUN:
-    ftpx ~/dotfiles `$(hostname):^ -z"
-
-Write-Host "`n💻 For WSL:
-    wsl_server.ps1
-    ftpx ~/dotfiles `$env:USERNAME@localhost:2222 -z
-    # OR:
-    New-Item -ItemType SymbolicLink -Path `$env:USERPROFILE\dotfiles -Target \\wsl`$\Ubuntu\home\`$env:USERNAME\dotfiles"
-
-Write-Host "`n☁️  Method 3: USING INTERNET SECURE SHARE
-    cd ~
-    cloud_copy SHARE_URL . --config ss
-    (requires symlinks to be created first)"
-
-Write-Host "`n----------------------------------------"
-if (-not $yesAll) {
-    $choice = Read-Host "🔒 Install SSH Server [y]/n"
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    Write-Host "`n🔧 Installing and configuring SSH server..."
-    Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0
-    Start-Service sshd
-    Set-Service -Name sshd -StartupType 'Automatic'
-    Write-Host "✅ SSH Server installed and configured successfully!"
-} else {
-    Write-Host "⏭️  Skipping SSH server installation"
-}
-
-Write-Host "`n✨ ===========================================
-🎉 Installation Complete!
-============================================="
-
-# Confirm copying finished
-if (-not $yesAll) {
-    $choice = Read-Host "Did you finish copying [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    Write-Host "Proceeding..."
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Create Symlinks
-if (-not $yesAll) {
-    $createLinksChoice = Read-Host "Create (Sym/Hard)links (finish dotfiles transfer first) [y]/n ? "
-} else {
-    $createLinksChoice = "y"
-}
-if ([string]::IsNullOrEmpty($createLinksChoice)) { $createLinksChoice = "y" }
-
-if ($createLinksChoice -eq "y" -or $createLinksChoice -eq "Y") {
-    if (-not $yesAll) {
-        $linkTypeChoice = Read-Host "Create Symlinks (s) or Hardlinks (h) [s]/h ? "
-    } else {
-        $linkTypeChoice = "h"
-    }
-
-    . ~\code\machineconfig\.venv\Scripts\Activate.ps1
-
-    if ($linkTypeChoice -eq "s" -or $linkTypeChoice -eq "S") {
-        python -m fire machineconfig.profile.create main --choice=all
-    } elseif ($linkTypeChoice -eq "h" -or $linkTypeChoice -eq "H") {
-        # python -m fire machineconfig.profile.create_hardlinks main --choice=all
-        python -m fire machineconfig.profile.create main --choice=all
-    } else {
-        Write-Host "Invalid choice for link type. Installation aborted."
-    }
-
-    # icacls "~\.ssh\*" /inheritance:r /grant:r "$($env:USERNAME):(F)"
-    # icacls "~\.ssh" /inheritance:r /grant:r "$($env:USERNAME):(F)"
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Install CLI Apps
-if (-not $yesAll) {
-    $choice = Read-Host "Install CLI Apps [y]/n ? "
-    if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-    if ($choice -eq "y" -or $choice -eq "Y") {
-        . ~\code\machineconfig\src\machineconfig\setup_windows\devapps.ps1
-    } else {
-        Write-Host "Installation aborted."
-    }
-    
-} else {
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_devapps_install main  --which=essentials
-}
-
-
-# Retrieve Repos
-if (-not $yesAll) {
-    $choice = Read-Host "Retrieve Repos at ~/code [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    repos ~\code --clone --cloud odg1
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Retrieve Data
-if (-not $yesAll) {
-    $choice = Read-Host "Retrieve data [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.scripts.python.devops_backup_retrieve main --direction=RETRIEVE
-} else {
-    Write-Host "Installation aborted."
-}
-
-
-# Install Brave, WezTerm, and VSCode
-if (-not $yesAll) {
-    $choice = Read-Host "Install Brave+WindowsTerminal+WezTerm+VSCode [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ([string]::IsNullOrEmpty($choice)) { $choice = "y" }
-if ($choice -eq "y" -or $choice -eq "Y") {
-    winget install --no-upgrade --name "Windows Terminal"             --Id "Microsoft.WindowsTerminal"  --source winget --scope user --accept-package-agreements --accept-source-agreements  # Terminal is is installed by default on W 11
-    winget install --no-upgrade --name "Powershell"                   --Id "Microsoft.PowerShell"       --source winget --scope user --accept-package-agreements --accept-source-agreements  # powershell require admin
-    winget install --no-upgrade --name "Brave"                        --Id "Brave.Brave"                --source winget --scope user --accept-package-agreements --accept-source-agreements
-    winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.setup_windows.wt_and_pwsh.install_nerd_fonts main
-    uv run --python 3.13 --with machineconfig python -m fire machineconfig.setup_windows.wt_and_pwsh.set_wt_settings main
-} else {
-    Write-Host "Installation aborted."
-}
-
-
-# Install Apps
-if (-not $yesAll) {
-    $choice = Read-Host "Install Windows Apps [y]/n ? "
-} else {
-    $choice = "y"
-}
-if ($choice -eq "y" -or $choice -eq "Y") {
-    Invoke-WebRequest -Uri "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/apps.ps1" -OutFile "apps.ps1"
-    .\apps.ps1
-} else {
-    Write-Host "Installation aborted."
-}
-
-# Instructions for Thunderbird profile restoration
-# Run this after installing Thunderbird and starting it and shutting it down but before downloading backup
-# cd ~/AppData/Roaming/ThunderBird/Profiles
-# $res = Get-ChildItem
-# $name = $res[0].Name
-# Move-Item $backup_folder $name