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

machineconfig/jobs/{python_custom_installers → installer/custom}/gh.py

@@ -1,10 +1,10 @@
 """gh-cli installer"""
 
 import platform
+import subprocess
 from typing import Optional
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
-from machineconfig.utils.terminal import Terminal
 
 r"""
 https://github.com/cli/cli
@@ -23,9 +23,18 @@ config_dict: InstallerData = {
     "appName": "gh",
     "repoURL": "https://github.com/cli/cli",
     "doc": "GitHub CLI",
-    "filenameTemplate": {"amd64": {"windows": "gh_{}_windows_amd64.zip", "linux": "gh_{}_linux_amd64.tar.gz", "macos": "gh_{}_macOS_amd64.tar.gz"}},
-    "stripVersion": True,
-    "exeName": "gh",
+    "fileNamePattern": {
+        "amd64": {
+            "windows": "gh_{version}_windows_amd64.msi",
+            "linux": "gh_{version}_linux_amd64.deb",
+            "macos": "gh_{version}_macOS_amd64.pkg",
+        },
+        "arm64": {
+            "windows": "gh_{version}_windows_arm64.msi",
+            "linux": "gh_{version}_linux_arm64.deb",
+            "macos": "gh_{version}_macOS_arm64.pkg",
+        },
+    },
 }
 
 
@@ -80,7 +89,15 @@ gh auth login --with-token $HOME/dotfiles/creds/git/gh_token.txt
 🔐 AUTHENTICATION | Setting up GitHub authentication with token...
 """)
 
-    Terminal().run(program, shell="default").print(desc="Installing GitHub Copilot extension", capture=True)
+    print("""
+🔄 EXECUTING | Running GitHub Copilot extension installation and authentication...
+""")
+    try:
+        subprocess.run(program, shell=True, text=True, check=True)
+        print("✅ Command executed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Command failed with exit code {e.returncode}")
+        raise
 
     print(f"""
 {"═" * 150}
@@ -90,8 +107,6 @@ gh auth login --with-token $HOME/dotfiles/creds/git/gh_token.txt
 {"═" * 150}
 """)
 
-    return program
-
 
 if __name__ == "__main__":
     pass

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

@@ -16,11 +16,20 @@ from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 config_dict: InstallerData = {
     "appName": "hx",
-    "repoURL": "CUSTOM",
+    "repoURL": "CMD",
     "doc": "Helix is a post-modern modal text editor.",
-    "filenameTemplate": {"amd64": {"windows": "helix-{}-x86_64-windows.zip", "linux": "helix-{}-x86_64-linux.tar.xz", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
-    "stripVersion": False,
-    "exeName": "hx",
+    "fileNamePattern": {
+        "amd64": {
+            "linux": "hx-linux-amd64.tar.xz",
+            "macos": "hx-macos-amd64.tar.xz",
+            "windows": "hx-windows-amd64.zip",
+        },
+        "arm64": {
+            "linux": "hx-linux-arm64.tar.xz",
+            "macos": "hx-macos-arm64.tar.xz",
+            "windows": "hx-windows-arm64.zip",
+        },
+    },
 }
 
 

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

@@ -1,14 +1,16 @@
 """alacritty"""
 
 import platform
+import subprocess
 from typing import Optional
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict: InstallerData = {"appName": "Alacritty", "repoURL": "CUSTOM", "doc": "Terminal Console", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "alacritty"}
+# config_dict: InstallerData = {"appName": "Alacritty", "repoURL": "CMD", "doc": "Terminal Console"}
 
 
-def main(version: Optional[str]):
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 🖥️  ALACRITTY INSTALLER | Installing GPU-accelerated terminal emulator
@@ -56,9 +58,13 @@ git clone https://github.com/alacritty/alacritty-theme ~/.config/alacritty/theme
 {"=" * 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 Alacritty installation...")
+    try:
+        subprocess.run(program, shell=True, text=True, check=True)
+        print("✅ Alacritty 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}/brave.py

@@ -1,22 +1,21 @@
 """brave installer"""
 
 import platform
+import subprocess
 from typing import Optional
 
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict: InstallerData = {
-    "appName": "Brave",
-    "repoURL": "CUSTOM",
-    "doc": "Privacy-focused web browser with built-in ad blocking",
-    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}},
-    "stripVersion": False,
-    "exeName": "brave",
-}
+# config_dict: InstallerData = {
+#     "appName": "Brave",
+#     "repoURL": "CMD",
+#     "doc": "Privacy-focused web browser with built-in ad blocking",
+# }
 
 
-def main(version: Optional[str]):
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 🦁 BRAVE BROWSER | Installing privacy-focused web browser
@@ -36,11 +35,11 @@ winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-
     elif platform.system() in ["Linux", "Darwin"]:
         system_name = "Linux" if platform.system() == "Linux" else "macOS"
         print(f"🐧 Installing Brave Browser on {system_name}...")
-        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/brave.sh").read_text(encoding="utf-8")
+            program = Path(module.__file__).parent.joinpath("linux_scripts/brave.sh").read_text(encoding="utf-8")
         else:  # Darwin/macOS
             program = "brew install --cask brave-browser"
     else:
@@ -62,9 +61,13 @@ winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-
 {"=" * 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 Brave Browser installation...")
+    try:
+        subprocess.run(program, shell=True, text=True, check=True)
+        print("✅ Brave Browser 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}/bypass_paywall.py

@@ -6,17 +6,15 @@ from machineconfig.utils.schemas.installer.installer_types import InstallerData
 from machineconfig.utils.path_extended import PathExtended as PathExtended
 
 
-config_dict: InstallerData = {
-    "appName": "bypass-paywalls-chrome",
-    "repoURL": "https://github.com/iamadamdev/bypass-paywalls-chrome",
-    "doc": """Plugin for chrome to bypass paywalls""",
-    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
-    "stripVersion": True,
-    "exeName": "",
-}
+# config_dict: InstallerData = {
+#     "appName": "bypass-paywalls-chrome",
+#     "repoURL": "https://github.com/iamadamdev/bypass-paywalls-chrome",
+#     "doc": """Plugin for chrome to bypass paywalls""",
+# }
 
 
-def main(version: Optional[str] = None):
+def main(installer_data: InstallerData, version: Optional[str] = None):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 🔓 BYPASS PAYWALL | Installing paywall bypass extension for Chrome

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

@@ -2,19 +2,12 @@
 
 from typing import Optional
 import platform
+import subprocess
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict: InstallerData = {
-    "appName": "Visual Studio Code",
-    "repoURL": "CUSTOM",
-    "doc": "Visual Studio Code",
-    "filenameTemplate": {"amd64": {"windows": "VSCodeSetup-{}.exe", "linux": "code_{}.deb", "macos": ""}},
-    "stripVersion": True,
-    "exeName": "code",
-}
 
-
-def main(version: Optional[str] = None):
+def main(installer_data: InstallerData, version: Optional[str] = None):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 💻 VS CODE INSTALLER | Setting up Visual Studio Code
@@ -25,10 +18,10 @@ def main(version: Optional[str] = None):
 
     if platform.system() == "Linux":
         print("🐧 Installing VS Code on Linux using official script...")
-        import machineconfig.jobs.python_custom_installers as module
+        import machineconfig.jobs.installer as module
         from pathlib import Path
 
-        install_script = Path(module.__file__).parent.joinpath("scripts/linux/vscode.sh").read_text(encoding="utf-8")
+        install_script = Path(module.__file__).parent.joinpath("linux_scripts/vscode.sh").read_text(encoding="utf-8")
     elif platform.system() == "Darwin":
         print("🍎 Installing VS Code on macOS using Homebrew...")
         install_script = """brew install --cask visual-studio-code"""
@@ -44,7 +37,14 @@ def main(version: Optional[str] = None):
 """)
         raise NotImplementedError(error_msg)
     _ = version
-    return install_script
+    
+    print("🔄 EXECUTING | Running VS Code installation...")
+    try:
+        subprocess.run(install_script, shell=True, text=True, check=True)
+        print("✅ VS Code 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}/cursor.py

@@ -7,7 +7,7 @@ from typing import Optional
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict: InstallerData = {"appName": "Cursor", "repoURL": "CUSTOM", "doc": "Cursor", "filenameTemplate": {"amd64": {"windows": "VSCodeSetup-{}.exe", "linux": "code_{}.deb", "macos": ""}}, "stripVersion": True, "exeName": "cursor"}
+# config_dict: InstallerData = {"appName": "Cursor", "repoURL": "CMD", "doc": "Cursor"}
 
 
 def install_linux(version: Optional[str] = None):
@@ -75,19 +75,17 @@ def install_windows(version: Optional[str] = None):
     # Run the installer silently
     try:
         print("Running Cursor installer...")
-        subprocess.run([str(cursor_installer), "/SILENT"], capture_output=True, text=True, check=True)
+        subprocess.run([str(cursor_installer), "/SILENT"], text=True, check=True)
         print("Cursor installer completed successfully.")
     except subprocess.CalledProcessError as e:
         print(f"Installer failed with exit code {e.returncode}")
-        print(f"Error output: {e.stderr}")
         # Try alternative silent install flags
         try:
             print("Trying alternative silent install...")
-            subprocess.run([str(cursor_installer), "/S"], capture_output=True, text=True, check=True)
+            subprocess.run([str(cursor_installer), "/S"], text=True, check=True)
             print("Cursor installer completed successfully with /S flag.")
         except subprocess.CalledProcessError as e2:
             print(f"Alternative installer also failed with exit code {e2.returncode}")
-            print(f"Error output: {e2.stderr}")
             # If silent install fails, run normally and let user handle it
             print("Running installer in normal mode (user interaction required)...")
             subprocess.run([str(cursor_installer)])
@@ -102,8 +100,9 @@ def install_windows(version: Optional[str] = None):
     print("Cursor installation completed. Check your Start Menu or Desktop for Cursor.")
 
 
-def main(version: Optional[str] = None):
+def main(installer_data: InstallerData, version: Optional[str] = None):
     """Main installation function that handles both Linux and Windows."""
+    _ = installer_data
     system = platform.system()
 
     if system == "Linux":
@@ -115,4 +114,5 @@ def main(version: Optional[str] = None):
 
 
 if __name__ == "__main__":
-    main()
+    pass
+    # main()

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

@@ -1,23 +1,21 @@
-"""
-A text expander is a program that detects when you type a specific keyword and replaces it with something else
+"""A text expander is a program that detects when you type a specific keyword and replaces it with something else
 
 https://github.com/espanso/espanso
 """
 
 from typing import Optional
+import subprocess
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict: InstallerData = {
-    "appName": "espanso",
-    "repoURL": "CUSTOM",
-    "doc": "A text expander.",
-    "filenameTemplate": {"amd64": {"windows": "Espanso-Win-Installer-x86_64.exe", "linux": "", "macos": "Espanso.dmg"}, "arm64": {"windows": "", "linux": "", "macos": ""}},
-    "stripVersion": False,
-    "exeName": "espanso",
-}
+# config_dict: InstallerData = {
+#     "appName": "espanso",
+#     "repoURL": "CMD",
+#     "doc": "A text expander.",
+# }
 
 
-def main(version: Optional[str]):
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 ⚡ ESPANSO INSTALLER | Setting up text expansion tool
@@ -29,7 +27,7 @@ def main(version: Optional[str]):
     _ = version
     import platform
 
-    config_dict["repoURL"] = "https://github.com/espanso/espanso"
+    installer_data["repoURL"] = "https://github.com/espanso/espanso"
     if platform.system() == "Windows":
         print("🪟 Installing Espanso on Windows...")
     elif platform.system() in ["Linux", "Darwin"]:
@@ -44,7 +42,7 @@ def main(version: Optional[str]):
 📦 Using Wayland-specific package
 {"=" * 150}
 """)
-                config_dict["filenameTemplate"]["amd64"]["linux"] = "espanso-debian-wayland-amd64.deb"
+                installer_data["fileNamePattern"]["amd64"]["linux"] = "espanso-debian-wayland-amd64.deb"
             else:
                 print(f"""
 {"=" * 150}
@@ -52,10 +50,10 @@ def main(version: Optional[str]):
 📦 Using X11-specific package
 {"=" * 150}
 """)
-                config_dict["filenameTemplate"]["amd64"]["linux"] = "espanso-debian-x11-amd64.deb"
+                installer_data["fileNamePattern"]["amd64"]["linux"] = "espanso-debian-x11-amd64.deb"
         else:  # Darwin/macOS
             print("🍎 Installing Espanso on macOS...")
-            config_dict["filenameTemplate"]["amd64"]["macos"] = "Espanso.dmg"
+            installer_data["fileNamePattern"]["amd64"]["macos"] = "Espanso.dmg"
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         print(f"""
@@ -68,7 +66,7 @@ def main(version: Optional[str]):
     print("🚀 Installing Espanso using installer...")
     from machineconfig.utils.installer_utils.installer_class import Installer
 
-    installer = Installer(config_dict)
+    installer = Installer(installer_data)
     installer.install(version=None)
 
     config = """
@@ -87,4 +85,10 @@ espanso install actually-all-emojis
 {"=" * 150}
 """)
 
-    return config
+    print("🔄 EXECUTING | Running Espanso configuration...")
+    try:
+        subprocess.run(config, shell=True, text=True, check=True)
+        print("✅ Espanso configuration completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Configuration failed with exit code {e.returncode}")
+        raise

machineconfig/jobs/installer/custom_dev/goes.py

@@ -0,0 +1,63 @@
+"""natural language to API
+https://github.com/    print("🔄 EXECUTING | Running Go installation...")
+    try:
+        subprocess.run(install_script, shell=True, text=True, check=True)
+        print("✅ Go installation completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Installation failed with exit code {e.returncode}")
+        raisel/gorilla
+"""
+
+import subprocess
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+# config_dict: InstallerData = {
+#     "appName": "Gorilla",
+#     "repoURL": "https://github.com/ShishirPatil/gorilla",
+#     "doc": "natural language to API",
+# }
+
+ve_name = "goex"
+
+
+def main(installer_data: InstallerData):
+    _ = installer_data
+    print(f"""
+{"=" * 150}
+🦍 GORILLA INSTALLER | Natural language to API converter
+🌐 Source: https://github.com/ShishirPatil/gorilla
+📦 Virtual Environment: {ve_name}
+{"=" * 150}
+""")
+
+    print("🔄 Preparing installation script...")
+    install_script = """
+
+cd ~/code/foreign
+git clone https://github.com/ShishirPatil/gorilla --depth 1
+cd gorilla/goex
+uv sync
+    """
+
+    print(f"""
+{"=" * 150}
+📋 INSTALLATION STEPS:
+1️⃣  Creating Python 3.13 virtual environment: {ve_name}
+2️⃣  Cloning Gorilla repository to ~/code/foreign
+3️⃣  Installing Gorilla in development mode
+{"=" * 150}
+
+✅ Installation script prepared successfully!
+""")
+
+    print("🔄 EXECUTING | Running Gorilla installation...")
+    try:
+        subprocess.run(install_script, shell=True, text=True, check=True)
+        print("✅ Gorilla installation completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Installation failed with exit code {e.returncode}")
+        raise
+
+
+if __name__ == "__main__":
+    pass

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

@@ -11,17 +11,8 @@ _ = Terminal, subprocess
 # as per https://www.lunarvim.org/docs/installation
 
 
-config_dict: InstallerData = {
-    "appName": "lvim",
-    "repoURL": "CUSTOM",
-    "doc": "Terminal text editor based on neovim.",
-    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
-    "stripVersion": False,
-    "exeName": "lvim",
-}
-
-
-def main(version: Optional[str]):
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
     print(f"""
 {"=" * 150}
 🌙 LUNARVIM INSTALLER | Setting up Neovim-based IDE
@@ -68,9 +59,14 @@ LV_BRANCH='release-1.4/neovim-0.9' bash <(curl -s https://raw.githubusercontent.
 ⚠️  NOTE: The installer will prompt for user input during installation.
 """)
 
-    # _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 LunarVim installation...")
+    try:
+        # Run with shell=True and allow interaction for user input
+        subprocess.run(program, shell=True, check=True)
+        print("✅ LunarVim installation completed successfully")
+    except subprocess.CalledProcessError as e:
+        print(f"❌ Installation failed with exit code {e.returncode}")
+        raise
 
 
 if __name__ == "__main__":

machineconfig/jobs/installer/custom_dev/nerdfont.py

@@ -0,0 +1,87 @@
+"""Nerd Fonts installer - Cross-platform font installation"""
+
+import platform
+import subprocess
+from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+def main(installer_data: InstallerData, version: Optional[str]) -> None:
+    """Main entry point for Nerd Fonts installation.
+    
+    Args:
+        installer_data: Installation configuration data
+        version: Specific version to install (None for latest)
+    """
+    _ = installer_data
+    print(f"""
+{"=" * 150}
+🔤 NERD FONTS INSTALLER | Installing programming fonts with icons
+💻 Platform: {platform.system()}
+🔄 Version: {"latest" if version is None else version}
+{"=" * 150}
+""")
+
+    _ = version
+    current_platform = platform.system()
+    
+    if current_platform == "Windows":
+        print("🪟 Installing Nerd Fonts on Windows...")
+        from machineconfig.jobs.installer.custom_dev.nerfont_windows_helper import install_nerd_fonts
+        
+        try:
+            install_nerd_fonts()
+            print(f"""
+{"=" * 150}
+✅ SUCCESS | Nerd Fonts installation completed successfully on Windows
+💡 TIP: Restart your terminal applications to see the new fonts
+{"=" * 150}
+""")
+        except Exception as e:
+            error_msg = f"Windows Nerd Fonts installation failed: {e}"
+            print(f"""
+{"⚠️" * 20}
+❌ ERROR | {error_msg}
+💡 TIP: Try running as administrator or install manually from https://www.nerdfonts.com
+{"⚠️" * 20}
+""")
+            raise RuntimeError(error_msg) from e
+            
+    elif current_platform in ["Linux", "Darwin"]:
+        print(f"🐧 Installing Nerd Fonts on {current_platform} using installation script...")
+        import machineconfig.jobs.installer as module
+        from pathlib import Path
+
+        program = Path(module.__file__).parent.joinpath("linux_scripts/nerdfont.sh").read_text(encoding="utf-8")
+        
+        print(f"""
+{"=" * 150}
+ℹ️  INFO | Nerd Fonts features:
+🎨 Programming fonts patched with icons
+🔣 Includes icons from popular sets (FontAwesome, Devicons, etc.)
+🖥️  Perfect for terminals and coding environments
+🧰 Works with many terminal applications and editors
+{"=" * 150}
+""")
+        
+        print("🔄 EXECUTING | Running Nerd Fonts installation...")
+        try:
+            subprocess.run(program, shell=True, text=True, check=True)
+            print("✅ Nerd Fonts installation completed successfully")
+        except subprocess.CalledProcessError as e:
+            print(f"❌ Installation failed with exit code {e.returncode}")
+            raise
+        
+    else:
+        error_msg = f"Unsupported platform: {current_platform}"
+        print(f"""
+{"⚠️" * 20}
+❌ ERROR | {error_msg}
+💡 TIP: Supported platforms are Windows, Linux, and macOS (Darwin)
+{"⚠️" * 20}
+""")
+        raise NotImplementedError(error_msg)
+
+
+if __name__ == "__main__":
+    pass