machineconfig 3.92__py3-none-any.whl → 3.94__py3-none-any.whl

machineconfig/{setup_windows/wt_and_pwsh/install_nerd_fonts.py → jobs/installer/custom_dev/nerfont_windows_helper.py}

@@ -1,41 +1,65 @@
 """
-setup file for each shell can be found in $profile. The settings.json is the config file for Terminal.
-https://glitchbone.github.io/vscode-base16-term/#/3024
+Windows-specific Nerd Fonts installation helper module.
 
+This module provides Windows-specific functionality for installing Nerd Fonts
+using PowerShell scripts and font enumeration.
 """
 
-from machineconfig.utils.path_extended import PathExtended as PathExtended
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
-from machineconfig.utils.installer_utils.installer_class import Installer
 import subprocess
 from typing import Iterable
+
+from machineconfig.utils.path_extended import PathExtended
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
+# Nerd Fonts installer configuration data
 nerd_fonts: InstallerData = {
     "appName": "Cascadia Code Nerd Font",
     "repoURL": "https://github.com/ryanoasis/nerd-fonts",
     "doc": "Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons)",
-    "filenameTemplate": {"amd64": {"windows": "CascadiaCode.zip", "linux": "CascadiaCode.zip", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
-    "stripVersion": False,
-    "exeName": "nerd_fonts",
+    "fileNamePattern": {
+        "amd64": {
+            "windows": "CaskaydiaCoveNerdFontWindows.zip",
+            "linux": "CaskaydiaCoveNerdFontLinux.zip",
+            "macos": "CaskaydiaCoveNerdFontMac.zip",
+        },
+        "arm64": {
+            "windows": "CaskaydiaCoveNerdFontWindows.zip",
+            "linux": "CaskaydiaCoveNerdFontLinux.zip",
+            "macos": "CaskaydiaCoveNerdFontMac.zip",
+        }
+    }
 }
 
 
 # Patterns to match any installed variant (NF, Nerd Font, Mono, Propo, style weights) of Cascadia/Caskaydia
 # We'll compile them at runtime for flexibility. Keep them simple to avoid false positives.
-REQUIRED_FONT_PATTERNS: tuple[str, ...] = (r"caskaydiacove.*(nf|nerd ?font)", r"cascadiacode.*(nf|nerd ?font)")
+REQUIRED_FONT_PATTERNS: tuple[str, ...] = (
+    r"caskaydiacove.*(nf|nerd ?font)",
+    r"cascadiacode.*(nf|nerd ?font)"
+)
 
 
 def _list_installed_fonts() -> list[str]:
     """Return list of installed font file base names (without extension) on Windows.
 
-    Uses PowerShell to enumerate c:\\windows\\fonts because Python on *nix host can't rely on that path.
+    Uses PowerShell to enumerate C:\\Windows\\Fonts because Python on *nix host can't rely on that path.
     If PowerShell call fails (e.g. running on non-Windows), returns empty list so install proceeds.
+    
+    Returns:
+        List of installed font base names
     """
     try:
         # Query only base names to make substring matching simpler; remove underscores like the PS script does.
-        cmd = ["powershell.exe", "-NoLogo", "-NonInteractive", "-Command", "Get-ChildItem -Path C:/Windows/Fonts -File | Select-Object -ExpandProperty BaseName"]
+        cmd = [
+            "powershell.exe",
+            "-NoLogo",
+            "-NonInteractive",
+            "-Command",
+            "Get-ChildItem -Path C:/Windows/Fonts -File | Select-Object -ExpandProperty BaseName"
+        ]
         res = subprocess.run(cmd, capture_output=True, text=True, check=True)  # noqa: S603 S607 (trusted command)
         fonts = [x.strip().replace("_", "") for x in res.stdout.splitlines() if x.strip() != ""]
         return fonts
@@ -45,6 +69,14 @@ def _list_installed_fonts() -> list[str]:
 
 
 def _missing_required_fonts(installed_fonts: Iterable[str]) -> list[str]:
+    """Check which required font patterns are missing from installed fonts.
+    
+    Args:
+        installed_fonts: List of installed font names
+        
+    Returns:
+        List of missing font patterns
+    """
     import re
 
     installed_norm = [f.lower().replace(" ", "") for f in installed_fonts]
@@ -57,14 +89,29 @@ def _missing_required_fonts(installed_fonts: Iterable[str]) -> list[str]:
 
 
 def install_nerd_fonts() -> None:
+    """Install Nerd Fonts on Windows using PowerShell script.
+    
+    This function:
+    1. Checks if required fonts are already installed
+    2. Downloads the font package if needed
+    3. Installs fonts using PowerShell script
+    4. Cleans up temporary files
+    
+    Raises:
+        subprocess.CalledProcessError: If PowerShell installation fails
+    """
     print(f"\n{'=' * 80}\n📦 INSTALLING NERD FONTS 📦\n{'=' * 80}")
+    
     installed = _list_installed_fonts()
     missing = _missing_required_fonts(installed)
+    
     if len(missing) == 0:
         print("✅ Required Nerd Fonts already installed. Skipping download & install.")
         return
+        
     print(f"🔍 Missing fonts detected: {', '.join(missing)}. Proceeding with installation...")
     print("🔍 Downloading Nerd Fonts package...")
+    
     folder, _version_to_be_installed = Installer(installer_data=nerd_fonts).download(version=None)
 
     print("🧹 Cleaning up unnecessary files...")
@@ -75,26 +122,22 @@ def install_nerd_fonts() -> None:
     print("⚙️  Installing fonts via PowerShell...")
     file = PathExtended.tmpfile(suffix=".ps1")
     file.parent.mkdir(parents=True, exist_ok=True)
+    
     raw_content = LIBRARY_ROOT.joinpath("setup_windows/wt_and_pwsh/install_fonts.ps1").read_text(encoding="utf-8").replace(r".\fonts-to-be-installed", str(folder))
     # PowerShell 5.1 can choke on certain unicode chars in some locales; keep ASCII only.
     content = "".join(ch for ch in raw_content if ord(ch) < 128)
     file.write_text(content, encoding="utf-8")
+    
     try:
         subprocess.run(rf"powershell.exe -executionpolicy Bypass -nologo -noninteractive -File {str(file)}", check=True)
     except subprocess.CalledProcessError as cpe:
-        print(f"💥 Font installation script failed (continuing without abort): {cpe}")
-        return
+        print(f"💥 Font installation script failed: {cpe}")
+        raise
+    finally:
+        print("🗑️  Cleaning up temporary files...")
+        if folder.exists():
+            folder.delete(sure=True)
+        if file.exists():
+            file.delete(sure=True)
 
-    print("🗑️  Cleaning up temporary files...")
-    folder.delete(sure=True)
     print(f"\n✅ Nerd Fonts installation complete! ✅\n{'=' * 80}")
-
-
-def main():
-    print(f"\n{'=' * 80}\n🎨 POWERSHELL THEME SETUP 🎨\n{'=' * 80}")
-    install_nerd_fonts()
-    print(f"\n✅ All PowerShell theme components installed successfully! ✅\n{'=' * 80}")
-
-
-if __name__ == "__main__":
-    pass

machineconfig/jobs/{python_custom_installers/dev → installer/custom_dev}/redis.py

@@ -1,13 +1,15 @@
 """nedis installer"""
 
 import platform
+import subprocess
 from typing import Optional
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict: InstallerData = {"appName": "Redis", "repoURL": "CUSTOM", "doc": "submillisecond fast key-value db", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "redis"}
+# config_dict: InstallerData = {"appName": "Redis", "repoURL": "CMD", "doc": "submillisecond fast key-value db"}
 
 
-def main(version: Optional[str]):
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 🗃️  REDIS INSTALLER | Setting up in-memory database
@@ -29,11 +31,10 @@ def main(version: Optional[str]):
     elif platform.system() in ["Linux", "Darwin"]:
         system_name = "Linux" if platform.system() == "Linux" else "macOS"
         print(f"🐧 Installing Redis on {system_name} using installation script...")
-        import machineconfig.jobs.python_custom_installers as module
+        import machineconfig.jobs.installer as module
         from pathlib import Path
-
         if platform.system() == "Linux":
-            program = Path(module.__file__).parent.joinpath("scripts/linux/redis.sh").read_text(encoding="utf-8")
+            program = Path(module.__file__).parent.joinpath("linux_scripts/redis.sh").read_text(encoding="utf-8")
         else:  # Darwin/macOS
             program = "brew install redis"
     else:
@@ -56,9 +57,13 @@ def main(version: Optional[str]):
 {"=" * 150}
 """)
 
-    # _res = Terminal(stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE).run_script(script=program, shell="default").print(desc="Running custom installer", capture=True)
-    # run script here as it requires user input
-    return program
+    print("🔄 EXECUTING | Running Redis installation...")
+    try:
+        subprocess.run(program, shell=True, text=True, check=True)
+        print("✅ Redis installation completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Installation failed with exit code {e.returncode}")
+        raise
 
 
 if __name__ == "__main__":

machineconfig/jobs/{python_custom_installers/dev → installer/custom_dev}/wezterm.py

@@ -1,15 +1,17 @@
 """wezterm installer"""
 
 import platform
+import subprocess
 from typing import Optional
 
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CUSTOM", "doc": "Modern, GPU-accelerated terminal emulator", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "wezterm"}
+# config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CMD", "doc": "Modern, GPU-accelerated terminal emulator"}
 
 
-def main(version: Optional[str]):
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
     print(f"""
 {"═" * 150}
 🖥️  WEZTERM INSTALLER | Modern, GPU-accelerated terminal emulator
@@ -33,11 +35,11 @@ def main(version: Optional[str]):
         print(f"""
 🐧 {system_name} SETUP | Installing WezTerm terminal emulator...
 """)
-        import machineconfig.jobs.python_custom_installers as module
+        import machineconfig.jobs.installer as module
         from pathlib import Path
 
         if platform.system() == "Linux":
-            program = Path(module.__file__).parent.joinpath("scripts/linux/wezterm.sh").read_text(encoding="utf-8")
+            program = Path(module.__file__).parent.joinpath("linux_scripts/wezterm.sh").read_text(encoding="utf-8")
         else:  # Darwin/macOS
             program = "brew install --cask wezterm"
     else:
@@ -61,9 +63,13 @@ def main(version: Optional[str]):
 {"═" * 150}
 """)
 
-    # _res = Terminal(stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE).run_script(script=program, shell="default").print(desc="Running custom installer", capture=True)
-    # run script here as it requires user input
-    return program
+    print("🔄 EXECUTING | Running WezTerm installation...")
+    try:
+        subprocess.run(program, shell=True, text=True, check=True)
+        print("✅ WezTerm installation completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Installation failed with exit code {e.returncode}")
+        raise
 
 
 if __name__ == "__main__":

machineconfig/jobs/{python_custom_installers/dev → installer/custom_dev}/winget.py

@@ -3,10 +3,9 @@ import requests
 import tempfile
 from pathlib import Path
 from typing import Optional
-from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict: InstallerData = {"appName": "winget", "repoURL": "CUSTOM", "doc": "winget installer", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "winget"}
+# config_dict: InstallerData = {"appName": "winget", "repoURL": "CMD", "doc": "winget installer"}
 
 
 def is_winget_available() -> bool:
@@ -93,7 +92,6 @@ def install_msix_package(package_path: Path) -> bool:
 
         result = subprocess.run(
             powershell_cmd,
-            capture_output=True,
             text=True,
             timeout=300,  # 5 minutes timeout
         )

machineconfig/jobs/{python_custom_installers/scripts/linux → installer/linux_scripts}/docker.sh

@@ -105,7 +105,7 @@ docker run hello-world || echo "⚠️ Docker hello-world test failed (you may n
 
 echo "👥 Adding current user to docker group..."
 sudo groupadd docker 2>/dev/null || echo "ℹ️ Docker group already exists"
-sudo usermod -aG docker $USER || echo "⚠️ Failed to add user to docker group"
+sudo usermod -aG docker $(whoami) || echo "⚠️ Failed to add user to docker group"
 
 echo """#=======================================================================
 ✅ INSTALLATION COMPLETE | Docker has been installed successfully

machineconfig/jobs/installer/packages_custom_dev.json

@@ -0,0 +1,226 @@
+{
+  "version": "1",
+  "installers": [
+    {
+      "appName": "Visual Studio Code",
+      "repoURL": "CMD",
+      "doc": "Visual Studio Code",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "code.py",
+          "windows": "code.py",
+          "macos": "code.py"
+        },
+        "arm64": {
+          "linux": "code.py",
+          "windows": "code.py",
+          "macos": "code.py"
+        }
+      }
+    },
+    {
+      "appName": "aider-chat",
+      "repoURL": "CMD",
+      "doc": "Aider Chat",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "uv tool install --force --python python3.13 aider-chat@latest",
+          "windows": "uv tool install --force --python python3.13 aider-chat@latest",
+          "macos": "uv tool install --force --python python3.13 aider-chat@latest"
+        },
+        "arm64": {
+          "linux": "uv tool install --force --python python3.13 aider-chat@latest",
+          "windows": "uv tool install --force --python python3.13 aider-chat@latest",
+          "macos": "uv tool install --force --python python3.13 aider-chat@latest"
+        }
+      }
+    },
+    {
+      "appName": "Alacritty",
+      "repoURL": "CMD",
+      "doc": "Terminal Console",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "alacritty.py",
+          "windows": "alacritty.py",
+          "macos": "alacritty.py"
+        },
+        "arm64": {
+          "linux": "alacritty.py",
+          "windows": "alacritty.py",
+          "macos": "alacritty.py"
+        }
+      }
+    },
+    {
+      "appName": "Brave",
+      "repoURL": "CMD",
+      "doc": "Privacy-focused web browser with built-in ad blocking",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "brave.py",
+          "windows": "brave.py",
+          "macos": "brave.py"
+        },
+        "arm64": {
+          "linux": "brave.py",
+          "windows": "brave.py",
+          "macos": "brave.py"
+        }
+      }
+    },
+    {
+      "appName": "bypass-paywalls-chrome",
+      "repoURL": "https://github.com/iamadamdev/bypass-paywalls-chrome",
+      "doc": "Plugin for chrome to bypass paywalls",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "bypass_paywall.py",
+          "windows": "bypass_paywall.py",
+          "macos": "bypass_paywall.py"
+        },
+        "arm64": {
+          "linux": "bypass_paywall.py",
+          "windows": "bypass_paywall.py",
+          "macos": "bypass_paywall.py"
+        }
+      }
+    },
+    {
+      "appName": "Cursor",
+      "repoURL": "CMD",
+      "doc": "Cursor",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "cursor.py",
+          "windows": "cursor.py",
+          "macos": "cursor.py"
+        },
+        "arm64": {
+          "linux": "cursor.py",
+          "windows": "cursor.py",
+          "macos": "cursor.py"
+        }
+      }
+    },
+    {
+      "appName": "espanso",
+      "repoURL": "CMD",
+      "doc": "A text expander.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "espanso.py",
+          "windows": "espanso.py",
+          "macos": "espanso.py"
+        },
+        "arm64": {
+          "linux": "espanso.py",
+          "windows": "espanso.py",
+          "macos": "espanso.py"
+        }
+      }
+    },
+    {
+      "appName": "Gorilla",
+      "repoURL": "https://github.com/ShishirPatil/gorilla",
+      "doc": "natural language to API",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "goes.py",
+          "windows": "goes.py",
+          "macos": "goes.py"
+        },
+        "arm64": {
+          "linux": "goes.py",
+          "windows": "goes.py",
+          "macos": "goes.py"
+        }
+      }
+    },
+    {
+      "appName": "lvim",
+      "repoURL": "CMD",
+      "doc": "Terminal text editor based on neovim.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "lvim.py",
+          "windows": "lvim.py",
+          "macos": "lvim.py"
+        },
+        "arm64": {
+          "linux": "lvim.py",
+          "windows": "lvim.py",
+          "macos": "lvim.py"
+        }
+      }
+    },
+    {
+      "appName": "nerdfont",
+      "repoURL": "CMD",
+      "doc": "lightweight containerization",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "nerdfont.py",
+          "windows": "nerdfont.py",
+          "macos": "nerdfont.py"
+        },
+        "arm64": {
+          "linux": "nerdfont.py",
+          "windows": "nerdfont.py",
+          "macos": "nerdfont.py"
+        }
+      }
+    },
+    {
+      "appName": "Redis",
+      "repoURL": "CMD",
+      "doc": "submillisecond fast key-value db",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "redis.py",
+          "windows": "redis.py",
+          "macos": "redis.py"
+        },
+        "arm64": {
+          "linux": "redis.py",
+          "windows": "redis.py",
+          "macos": "redis.py"
+        }
+      }
+    },
+    {
+      "appName": "Wezterm",
+      "repoURL": "CMD",
+      "doc": "Modern, GPU-accelerated terminal emulator",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "wezterm.py",
+          "windows": "wezterm.py",
+          "macos": "wezterm.py"
+        },
+        "arm64": {
+          "linux": "wezterm.py",
+          "windows": "wezterm.py",
+          "macos": "wezterm.py"
+        }
+      }
+    },
+    {
+      "appName": "winget",
+      "repoURL": "CMD",
+      "doc": "winget installer",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "winget.py",
+          "windows": "winget.py",
+          "macos": "winget.py"
+        },
+        "arm64": {
+          "linux": "winget.py",
+          "windows": "winget.py",
+          "macos": "winget.py"
+        }
+      }
+    }
+  ]
+}

machineconfig/jobs/installer/packages_custom_essential.json

@@ -0,0 +1,39 @@
+{
+  "version": "1",
+  "installers": [
+    {
+      "appName": "gh",
+      "repoURL": "CMD",
+      "doc": "GitHub CLI",
+      "fileNamePattern": {
+        "amd64": {
+          "windows": "gh.py",
+          "linux": "gh.py",
+          "macos": "gh.py"
+        },
+        "arm64": {
+          "windows": "gh.py",
+          "linux": "gh.py",
+          "macos": "gh.py"
+        }
+      }
+    },
+    {
+      "appName": "hx",
+      "repoURL": "CMD",
+      "doc": "Helix is a post-modern modal text editor.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "hx.py",
+          "windows": "hx.py",
+          "macos": "hx.py"
+        },
+        "arm64": {
+          "linux": "hx.py",
+          "windows": "hx.py",
+          "macos": "hx.py"
+        }
+      }
+    }
+  ]
+}