machineconfig 7.50__py3-none-any.whl → 8.12__py3-none-any.whl

machineconfig/jobs/installer/linux_scripts/q.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
-mkdir -p $HOME/Downloads || true
-cd $HOME/Downloads
-curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
-unzip q.zip
-./q/install.sh  # goes to ~/.local/bin.
-rm q.zip
-rm -rfd q
+# mkdir -p $HOME/Downloads || true
+# cd $HOME/Downloads
+# curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
+# unzip q.zip
+# ./q/install.sh  # goes to ~/.local/bin.
+# rm q.zip
+# rm -rfd q
+
+# This is a clean installation that inloves only binary movement, no bashrc manipulation.
+devops install "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip"

machineconfig/jobs/installer/linux_scripts/redis.sh

@@ -45,6 +45,7 @@ sudo nala update
 # Install Redis
 echo "📥 Installing Redis..."
 sudo nala install redis -y
+sudo nala install redis-tools -y
 
 echo """✅ INSTALLATION COMPLETE | Redis has been installed successfully
 

machineconfig/jobs/installer/package_groups.py

@@ -1,4 +1,10 @@
-from typing import Literal, TypeAlias, Union
+
+GUI = [
+    "brave",
+    "code",
+    "git",
+    # "wezterm",  # needs admin
+]
 
 # AI/LLM Tools - AI-powered coding and chat assistants
 AGENTS = [
@@ -8,7 +14,6 @@ AGENTS = [
     "gemini",
     "crush",
     "opencode-ai",
-    "ollama",
     "chatgpt",
     "mods",
     "q",
@@ -18,6 +23,9 @@ AGENTS = [
     "kilocode",
     "cline",
     "auggie",
+    # "codex",
+    # "gorilla",
+    # "ollama",
 ]
 
 
@@ -55,9 +63,14 @@ PACKAGES_CODE_EDITORS = [
 # Database Tools - Database clients and visualizers
 PACKAGES_DATABASE = [
     "SqliteBrowser",
+    "sqlite3",
+    "redis",
+    "redis-cli",
+    "postgresql-client",
+    "duckdb",
     "DBeaver",
     "rainfrog",
-    "duckdb",
+
 ]
 
 
@@ -137,21 +150,23 @@ PACKAGES_PRODUCTIVITY = [
     "hx",
 ]
 
-# Miscellaneous Tools - Other tools
-PACKAGES_MISC_DEV = [
+
+# sudo nala install cowsay -y || true
+# sudo nala install lolcat -y || true
+# sudo nala install boxes -y || true
+# sudo nala install figlet -y || true
+# sudo nala install fortune -y || true
+# sudo nala install toilet -y || true
+TERMINAL_EYE_CANDY = [
     "lolcatjs",
     "figlet-cli",
     "boxes",
-    "Gorilla",
-    "Redis",
-    "transmission",
-    "bytehound",
-    "atuin",
-    "xcrawl3r",
-    "obsidian",
-    "istio",
-    "cointop",
-    "nnn",
+    # "transmission",
+    # "bytehound",
+    # "xcrawl3r",
+    # "obsidian",
+    # "istio",
+    # "cointop",
 ]
 
 
@@ -179,6 +194,7 @@ PACKAGES_FILE = [
     "winget",
     "fd",
     "fzf",
+    "tv",
     "broot",
     "rg",
     "rga",
@@ -190,6 +206,7 @@ PACKAGES_FILE = [
     # "xplr",
     # "joshuto",
     # "lf",
+    # "nnn",
     "yazi",
     "tere",
     # "exa",
@@ -207,6 +224,7 @@ PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
     "mcfly",
+    "atuin",
     "starship",
     "gotty",
     "ttyd",
@@ -216,74 +234,24 @@ PACKAGES_TERMINAL_SHELL = [
 
 
 
-
-
-PACKAGE_GROUPS: TypeAlias = Literal[
-    "ESSENTIAL",
-    "DEV",
-    "AGENTS",
-    "TUNNELING",
-    "TERMINAL_EMULATORS",
-    "BROWSERS",
-    "CODE_EDITORS",
-    "PRESENTATION",
-    "DATABASE",
-    "DOC_CONVERSION",
-    "MEDIA",
-    "FILE_SHARING",
-    "GIT_DOCKER_TOOLS",
-    "DEV_UTILS",
-    "CODE_ANALYSIS",
-    "PRODUCTIVITY",
-    "MISC_DEV",
-    "SYSTEM_MONITORS",
-    "FILE_TOOLS",
-    "FILE_VIEWERS",
-    "SEARCH",
-    "TERMINAL_SHELL",
-    "CLOUD_UTILS",
-    "WEB_TERMINAL",
-]
-
-
-
-# Main ESSENTIAL package list - combines all subgroups
-ESSENTIAL = [
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_SYSTEM_MONITORS,
-    *PACKAGES_TERMINAL_SHELL,
-    *PACKAGES_FILE,
-]
-DEV = [
-    *PACKAGES_TERMINAL_EMULATORS,
-    *PACKAGES_BROWSERS,
-    *PACKAGES_CODE_EDITORS,
-    *PACKAGES_DATABASE,
-    *PACKAGES_MEDIA,
-    *PACKAGES_FILE_SHARING,
-    *PACKAGES_DEV_UTILS,
-    *PACKAGES_CODE_ANALYSIS,
-    *PACKAGES_PRODUCTIVITY,
-    *PACKAGES_MISC_DEV,
-]
-
-PACKAGE_GROUP2NAMES: dict[PACKAGE_GROUPS, list[str]] = {
-    "ESSENTIAL": ESSENTIAL,
-    "DEV": DEV,
-    "AGENTS": AGENTS,
-    "TERMINAL_EMULATORS": PACKAGES_TERMINAL_EMULATORS,
-    "BROWSERS": PACKAGES_BROWSERS,
-    "CODE_EDITORS": PACKAGES_CODE_EDITORS,
-    "DATABASE": PACKAGES_DATABASE,
-    "MEDIA": PACKAGES_MEDIA,
-    "FILE_SHARING": PACKAGES_FILE_SHARING,
-    "DEV_UTILS": PACKAGES_DEV_UTILS,
-    "CODE_ANALYSIS": PACKAGES_CODE_ANALYSIS,
-    "PRODUCTIVITY": PACKAGES_PRODUCTIVITY,
-    "MISC_DEV": PACKAGES_MISC_DEV,
-    "SYSTEM_MONITORS": PACKAGES_SYSTEM_MONITORS,
-    "SEARCH": PACKAGES_FILE,
-    "TERMINAL_SHELL": PACKAGES_TERMINAL_SHELL,
+PACKAGE_GROUP2NAMES: dict[str, list[str]] = {
+    "sysabc": ["sysabc"],
+    "termabc": [*PACKAGES_CODE_ANALYSIS, *PACKAGES_SYSTEM_MONITORS, *PACKAGES_TERMINAL_SHELL, *PACKAGES_FILE,],
+    "gui": GUI,
+    "dev": [*PACKAGES_TERMINAL_EMULATORS, *PACKAGES_BROWSERS, *PACKAGES_CODE_EDITORS, *PACKAGES_DATABASE, *PACKAGES_MEDIA, *PACKAGES_FILE_SHARING, *PACKAGES_DEV_UTILS, *PACKAGES_CODE_ANALYSIS, *PACKAGES_PRODUCTIVITY, *TERMINAL_EYE_CANDY,],
+    "dev-utils": PACKAGES_DEV_UTILS,
+    "term-eye-candy": TERMINAL_EYE_CANDY,
+    "agents": AGENTS,
+    "terminal-emulator": PACKAGES_TERMINAL_EMULATORS,
+    "shell": PACKAGES_TERMINAL_SHELL,
+    "browsers": PACKAGES_BROWSERS,
+    "code-editors": PACKAGES_CODE_EDITORS,
+    "code-analysis": PACKAGES_CODE_ANALYSIS,
+    "db": PACKAGES_DATABASE,
+    "media": PACKAGES_MEDIA,
+    "file-sharing": PACKAGES_FILE_SHARING,
+    "productivity": PACKAGES_PRODUCTIVITY,
+    "sys-monitor": PACKAGES_SYSTEM_MONITORS,
+    "search": PACKAGES_FILE,
 }
 
-_ = Union, Literal

machineconfig/jobs/installer/powershell_scripts/install_fonts.ps1

@@ -6,6 +6,19 @@ $objShell = New-Object -ComObject Shell.Application
 $objFolder = $objShell.Namespace($FONTS)
 $Fontdir = Get-ChildItem -Path $Path -File
 
+$invalidCharPattern = "[{0}]" -f ([Regex]::Escape(([string]::Join('', [System.IO.Path]::GetInvalidFileNameChars()))))
+
+function Get-FontBaseNameSafe {
+    param([string]$Input)
+    if ([string]::IsNullOrWhiteSpace($Input)) { return "" }
+    $candidate = ($Input -split ',')[0].Trim()
+    try { return [System.IO.Path]::GetFileNameWithoutExtension($candidate) }
+    catch {
+        $sanitized = [Regex]::Replace($candidate, $invalidCharPattern, '')
+        return ($sanitized -replace '\\.[^.]+$')
+    }
+}
+
 # Normalization helper: remove spaces, underscores, hyphens, 'nerd', 'font', and collapse 'nf' for broad matching
 function Normalize-FontName {
     param([string]$Name)
@@ -17,47 +30,129 @@ function Normalize-FontName {
     return $n
 }
 
+function Get-FontIdentityForms {
+    param([string]$Name)
+    if ([string]::IsNullOrWhiteSpace($Name)) { return @() }
+    $normalized = Normalize-FontName $Name
+    if ([string]::IsNullOrWhiteSpace($normalized)) { return @() }
+
+    $forms = @()
+    $forms += $normalized
+
+    $stylePattern = '(regular|italic|oblique|bold|bolditalic|semibold|semilight|light|extrabold|extralight|medium|thin|black|book|ultra|heavy|demi|retina|condensed|narrow|windowscompatible|complete|windowscomp|compatibility)+$'
+    $stem = $normalized
+    while ($stem -match $stylePattern) {
+        $stem = [Regex]::Replace($stem, $stylePattern, '')
+        if ([string]::IsNullOrWhiteSpace($stem)) { break }
+        $forms += $stem
+    }
+
+    $stemForVariants = $stem
+    foreach ($tail in @('mono', 'propo')) {
+        $tmp = $stemForVariants
+        while (-not [string]::IsNullOrWhiteSpace($tmp) -and $tmp.EndsWith($tail)) {
+            $tmp = $tmp.Substring(0, $tmp.Length - $tail.Length)
+            if ([string]::IsNullOrWhiteSpace($tmp)) { break }
+            $forms += $tmp
+        }
+    }
+
+    return ($forms | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique)
+}
+
+function Test-FontFormsOverlapFuzzy {
+    param(
+        [string[]]$CandidateForms,
+        [string[]]$ExistingForms
+    )
+    foreach ($candidate in $CandidateForms) {
+        if ([string]::IsNullOrWhiteSpace($candidate)) { continue }
+        foreach ($existing in $ExistingForms) {
+            if ([string]::IsNullOrWhiteSpace($existing)) { continue }
+            if ($existing.Contains($candidate) -or $candidate.Contains($existing)) { return $true }
+        }
+    }
+    return $false
+}
+
+function Merge-UniqueForms {
+    param(
+        [string[]]$Existing,
+        [string[]]$Additional
+    )
+    return (($Existing + $Additional) | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique)
+}
+
 # Cache installed font basenames once (raw + normalized map)
 $installedFontFiles = Get-ChildItem C:\Windows\Fonts -File
-$installedFonts = @{}
-foreach ($f in $installedFontFiles) { $installedFonts[(Normalize-FontName $f.BaseName)] = 1 }
+$installedFonts = @()
+foreach ($f in $installedFontFiles) {
+    $installedFonts = Merge-UniqueForms $installedFonts (Get-FontIdentityForms $f.BaseName)
+}
 
-Write-Host "Existing related fonts detected:" ($installedFonts.Keys | Where-Object { $_ -match 'caskaydiacove|cascadiacode' } | Sort-Object | Get-Unique) -ForegroundColor DarkGray
+$relatedInstalled = $installedFonts | Where-Object { $_ -match 'caskaydiacove|cascadiacode' } | Sort-Object | Get-Unique
+Write-Host "Existing related fonts detected:" $relatedInstalled -ForegroundColor DarkGray
+
+$registryFonts = @()
+$fontReg = $null
+try {
+    $fontReg = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts' -ErrorAction Stop
+} catch {
+    Write-Host "Registry font list unavailable: $($_.Exception.Message)" -ForegroundColor DarkYellow
+}
+if ($null -ne $fontReg) {
+    foreach ($prop in $fontReg.PSObject.Properties) {
+        $val = ($prop.Value | Out-String).Trim()
+        $nm  = ($prop.Name | Out-String).Trim()
+        $registryFonts = Merge-UniqueForms $registryFonts (Get-FontIdentityForms (Get-FontBaseNameSafe $val))
+        $registryFonts = Merge-UniqueForms $registryFonts (Get-FontIdentityForms (Get-FontBaseNameSafe $nm))
+    }
+}
 
 foreach ($File in $Fontdir) {
-    if ($File.Name -notmatch 'pfb$') {
-    $candidateRaw = $File.BaseName
-    $candidateNorm = Normalize-FontName $candidateRaw
-
-        # 1. Exact file existence check (handles .ttf/.otf pairs) before invoking Shell CopyHere.
-        $destFile = Join-Path -Path 'C:\Windows\Fonts' -ChildPath $File.Name
-        if (Test-Path -LiteralPath $destFile) { Write-Host "Skip (file exists) $($File.Name)" -ForegroundColor Green; continue }
-
-        # 2. Registry check: Fonts are registered under HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts
-        try {
-            $fontReg = Get-ItemProperty 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts' -ErrorAction Stop
-            $regMatch = $false
-            foreach ($prop in $fontReg.PSObject.Properties) {
-                $val = ($prop.Value | Out-String).Trim()
-                $nm  = ($prop.Name | Out-String).Trim()
-                $valNorm = Normalize-FontName ( [System.IO.Path]::GetFileNameWithoutExtension($val) )
-                $nmNorm  = Normalize-FontName $nm
-                if ($valNorm -eq $candidateNorm -or $nmNorm -eq $candidateNorm -or $nmNorm -match [Regex]::Escape($candidateNorm)) { $regMatch = $true; break }
-            }
-            if ($regMatch) {
-                Write-Host "Skip (registry) $($File.Name)" -ForegroundColor Green
-                continue
-            }
-        } catch {
-            Write-Host "Registry font query failed: $($_.Exception.Message) (continuing)" -ForegroundColor DarkYellow
-        }
+    if ($File.Name -match 'pfb$') { continue }
 
-        # 3. Original heuristic set: in-memory list
-        if ($installedFonts.ContainsKey($candidateNorm)) { Write-Host "Skip (norm map) $($File.Name)" -ForegroundColor Green; continue }
-        if ($installedFonts.Keys | Where-Object { $_ -match [Regex]::Escape($candidateNorm) }) { Write-Host "Skip (norm regex) $($File.Name)" -ForegroundColor Green; continue }
+    $candidateForms = Get-FontIdentityForms $File.BaseName
+    if ($candidateForms.Count -eq 0) { $candidateForms = @(Normalize-FontName $File.BaseName) }
+    $candidateNorm = if ($candidateForms.Count -gt 0) { $candidateForms[0] } else { '' }
 
-        Write-Host "Installing font (no matches) $($File.Name) | norm=$candidateNorm" -ForegroundColor Yellow
-        $objFolder.CopyHere($File.FullName)
+    # 1. Exact file existence check (handles .ttf/.otf pairs) before invoking Shell CopyHere.
+    $destFile = Join-Path -Path 'C:\Windows\Fonts' -ChildPath $File.Name
+    if (Test-Path -LiteralPath $destFile) {
+        Write-Host "Skip (file exists) $($File.Name)" -ForegroundColor Green
+        $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+        continue
     }
+
+    # 2. Registry check: Fonts are registered under HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts
+    if ($registryFonts.Count -gt 0) {
+        $exactRegMatch = $candidateForms | Where-Object { $registryFonts -contains $_ }
+        if ($exactRegMatch.Count -gt 0) {
+            Write-Host "Skip (registry) $($File.Name)" -ForegroundColor Green
+            $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+            continue
+        }
+        if (Test-FontFormsOverlapFuzzy $candidateForms $registryFonts) {
+            Write-Host "Skip (registry family) $($File.Name)" -ForegroundColor Green
+            $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+            continue
+        }
+    }
+
+    # 3. Original heuristic set: in-memory list
+    if (($candidateForms | Where-Object { $installedFonts -contains $_ }).Count -gt 0) {
+        Write-Host "Skip (installed map) $($File.Name)" -ForegroundColor Green
+        $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+        continue
+    }
+    if (Test-FontFormsOverlapFuzzy $candidateForms $installedFonts) {
+        Write-Host "Skip (installed family) $($File.Name)" -ForegroundColor Green
+        $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
+        continue
+    }
+
+    Write-Host "Installing font (no matches) $($File.Name) | norm=$candidateNorm" -ForegroundColor Yellow
+    $objFolder.CopyHere($File.FullName)
+    $installedFonts = Merge-UniqueForms $installedFonts $candidateForms
 }
 Write-Host "Font installation script completed." -ForegroundColor Cyan

machineconfig/jobs/installer/{custom → python_scripts}/boxes.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 from rich.console import Console
 from rich.panel import Panel
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
@@ -40,7 +40,7 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
     )
 
     installer = Installer(installer_data=installer_data_modified)
-    downloaded, _version_to_be_installed = installer.download(version=version)
+    downloaded, _version_to_be_installed = installer.binary_download(version=version)
     decomp_path = downloaded.decompress()
     from pathlib import Path
     for item in decomp_path.rglob("*"):

machineconfig/jobs/installer/{custom_dev → python_scripts}/brave.py

@@ -27,7 +27,7 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
         console.print("🪟 Installing Brave Browser on Windows using winget...", style="bold")
         program = """
 
-winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-package-agreements --accept-source-agreements
+winget install --no-upgrade --name "Brave"                        --Id "Brave.Brave"                --source winget --scope user --accept-package-agreements --accept-source-agreements
 
 """
     elif platform.system() in ["Linux", "Darwin"]:
@@ -70,9 +70,11 @@ winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-
     )
 
     console.print("🔄 EXECUTING | Running Brave Browser installation...", style="bold yellow")
+    from machineconfig.utils.code import print_code, run_shell_script
     try:
-        subprocess.run(program, shell=True, text=True, check=True)
-        console.print("✅ Brave Browser installation completed successfully", style="bold green")
+        print_code(code=program, lexer="shell", desc="Installation Script Preview")
+        run_shell_script(program)
+        console.print("✅ Installation completed successfully!", style="bold green")
     except subprocess.CalledProcessError as e:
         console.print(f"❌ Installation failed with exit code {e.returncode}", style="bold red")
         raise

machineconfig/jobs/installer/python_scripts/cloudflare_warp_cli.py

@@ -0,0 +1,23 @@
+
+from typing import Optional
+import platform
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data, version
+    system = platform.system()
+    if system == "Windows":
+        raise NotImplementedError("Installer is not yet implemented for Windows.")
+    elif system == "Linux":
+        from pathlib import Path
+        import machineconfig.jobs.installer as module
+        program = Path(module.__file__).parent.joinpath("linux_scripts/cloudflare_warp_cli.sh").read_text(encoding="utf-8")
+    elif system == "Darwin":
+        program = "brew install --cask cloudflare-warp"
+    else:
+        raise NotImplementedError(f"Unsupported platform: {system}")
+    import subprocess
+    subprocess.run(program, shell=True, check=True)
+    return f"Cloudflare WARP CLI installed successfully on {system}."
+

machineconfig/jobs/installer/{custom_dev → python_scripts}/code.py

@@ -32,7 +32,10 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
         install_script = """brew install --cask visual-studio-code"""
     elif platform.system() == "Windows":
         console.print("🪟 Installing VS Code on Windows using winget...", style="bold")
-        install_script = """winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements"""
+        install_script = """
+winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements
+
+"""
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         console.print(

machineconfig/jobs/installer/{custom_dev → python_scripts}/dubdb_adbc.py

@@ -25,6 +25,6 @@ installer_data: InstallerData = {
 
 def main(installer_data: InstallerData, version: Optional[str]) -> None:
     _ = version
-    from machineconfig.utils.installer import Installer
+    from machineconfig.utils.installer_utils.installer_runner import Installer
     installer = Installer(installer_data)
     installer.install(version=None)

machineconfig/jobs/installer/{custom → python_scripts}/hx.py

@@ -3,17 +3,18 @@ Installers do not add runtime files to the machine, hence this script.
 """
 
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform
 
-from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import LINUX_INSTALL_PATH
 from machineconfig.utils.installer_utils.installer_class import Installer
 from rich.console import Console
 from rich.panel import Panel
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
+LANGUAGES_SUPPORTED_GRAMMER = ["python.so", "nu.so", "bash.so", "lua.so", "powershell.so"]
 config_dict: InstallerData = {
     "appName": "hx",
     "repoURL": "CMD",
@@ -44,7 +45,7 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
     inst = Installer(installer_data=config_dict_copy)
 
     print("\n📥 [Step 1/5] Downloading Helix editor...")
-    downloaded, _version_to_be_installed = inst.download(version=version)
+    downloaded, _version_to_be_installed = inst.binary_download(version=version)
     print("   ✨ Download complete.")
 
     print("\n🔍 [Step 2/5] Locating executable and components...")
@@ -58,6 +59,7 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
         raise FileNotFoundError(f"Could not find 'hx' executable in {downloaded.name}")
 
     assert len(hx_file_search) == 1, f"Expected 1 'hx' executable, found {len(hx_file_search)}"
+
     hx_file = hx_file_search[0]
     contrib = hx_file.parent / "contrib"
     runtime = contrib.parent / "runtime"
@@ -101,11 +103,12 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
                 if not child.exists():
                     continue
                 if child.name == "grammars":
-                    # copy only the python.so file from runtime/grammars if it exists
-                    python_so = child.joinpath("python.so")
-                    if python_so.exists() and python_so.is_file():
-                        dest = target_runtime.joinpath("grammars")
-                        python_so.copy(folder=dest, overwrite=True)
+                    # copy only the specific language files from runtime/grammars if they exist
+                    for a_language in LANGUAGES_SUPPORTED_GRAMMER:
+                        lang_file = child.joinpath(a_language)
+                        if lang_file.exists() and lang_file.is_file():
+                            dest = target_runtime.joinpath("grammars")
+                            lang_file.copy(folder=dest, overwrite=True)
                 else:
                     # copy the whole child (file or directory) into target_runtime
                     # for directories, copy will create target_runtime/<child.name>
@@ -147,10 +150,11 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
                 if not child.exists():
                     continue
                 if child.name == "grammars":
-                    python_so = child.joinpath("python.so")
-                    if python_so.exists() and python_so.is_file():
-                        dest = target_runtime.joinpath("grammars")
-                        python_so.copy(folder=dest, overwrite=True)
+                    for a_language in LANGUAGES_SUPPORTED_GRAMMER:
+                        lang_file = child.joinpath(a_language)
+                        if lang_file.exists() and lang_file.is_file():
+                            dest = target_runtime.joinpath("grammars")
+                            lang_file.copy(folder=dest, overwrite=True)
                 else:
                     try:
                         child.copy(folder=target_runtime, overwrite=True)

machineconfig/jobs/installer/{custom_dev → python_scripts}/nerdfont.py

@@ -32,7 +32,7 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
 
     if current_platform == "Windows":
         console.print("🪟 Installing Nerd Fonts on Windows...", style="bold")
-        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
 
         try:
             install_nerd_fonts()
@@ -108,4 +108,4 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
 
 
 if __name__ == "__main__":
-    pass
+    main(1, None)  # type: ignore