machineconfig 7.71__tar.gz → 7.84__tar.gz

{machineconfig-7.71/src/machineconfig.egg-info → machineconfig-7.84}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 7.71
+Version: 7.84
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -53,7 +53,7 @@ Requires-Dist: python-magic>=0.4.27; extra == "plot"
 
 # 🧠 Welcome to **Machineconfig**
 
-**Machineconfig** is a cli-based **Digital Life Manager** — It's called so because no existing category of software fully captures its scope. At the same time, it is a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience.
+**Machineconfig** is a cli-based **Stack Manager** — It is a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience, that is consistent across different platforms.
 
 
 ## 💡 Motivation

{machineconfig-7.71 → machineconfig-7.84}/README.md

@@ -10,7 +10,7 @@
 
 # 🧠 Welcome to **Machineconfig**
 
-**Machineconfig** is a cli-based **Digital Life Manager** — It's called so because no existing category of software fully captures its scope. At the same time, it is a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience.
+**Machineconfig** is a cli-based **Stack Manager** — It is a *Package Manager*, *Configuration Manager*, *Automation Tool*, *Dotfiles Manager*, *Data Solution*, and *Code Manager*, among other functionalities covered, all rolled into one seamless experience, that is consistent across different platforms.
 
 
 ## 💡 Motivation

{machineconfig-7.71 → machineconfig-7.84}/pyproject.toml

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

{machineconfig-7.71 → machineconfig-7.84}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -7,10 +7,10 @@ from pathlib import Path
 def get_fire_tab_using_uv(func: FunctionType, tab_weight: int, import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> tuple[TabConfig, Path]:
     from machineconfig.utils.meta import lambda_to_python_script
     if func.__name__ == "<lambda>":
-        py_script =  lambda_to_python_script(lmb=func,
+        py_script =  lambda_to_python_script(func,
                                              in_global=True, import_module=import_module)
     else:
-        py_script =  lambda_to_python_script(lmb=lambda: func(),
+        py_script =  lambda_to_python_script(lambda: func(),
                                              in_global=True, import_module=import_module)
     from machineconfig.utils.code import get_uv_command_executing_python_script
     command_to_run, py_script_path = get_uv_command_executing_python_script(python_script=py_script, uv_with=uv_with, uv_project_dir=uv_project_dir)

machineconfig-7.84/src/machineconfig/jobs/installer/custom/yazi.py

@@ -0,0 +1,120 @@
+
+from typing import Optional
+import platform
+from machineconfig.utils.installer_utils.installer_class import Installer
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+installer_standard: InstallerData =    {
+      "appName": "yazi",
+      "repoURL": "https://github.com/sxyazi/yazi",
+      "doc": "⚡ Blazing Fast Terminal File Manager.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "yazi-x86_64-unknown-linux-musl.zip",
+          "macos": "yazi-x86_64-apple-darwin.zip",
+          "windows": "yazi-x86_64-pc-windows-msvc.zip"
+        },
+        "arm64": {
+          "linux": "yazi-aarch64-unknown-linux-musl.zip",
+          "macos": "yazi-aarch64-apple-darwin.zip",
+          "windows": "yazi-aarch64-pc-windows-msvc.zip"
+        }
+      }
+    }
+
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data
+    inst = Installer(installer_data=installer_standard)
+    inst.install(version=version)
+
+    print("\n" * 5)
+    print("Installing Yazi plugins and flavors...")
+    installer_standard["appName"] = "ya"
+    inst = Installer(installer_data=installer_standard)
+    inst.install(version=version)
+
+    print("\n" * 5)
+    print("Cloning Yazi plugins and flavors repositories...")
+
+    from pathlib import Path
+    system_name = platform.system().lower()
+    home_dir = Path.home()
+    if system_name == "windows":
+        yazi_plugins_dir = home_dir.joinpath("AppData", "Roaming", "yazi", "config")
+    else:
+        yazi_plugins_dir = home_dir.joinpath(".config", "yazi")
+    
+    yazi_plugins_path = yazi_plugins_dir.joinpath("plugins")
+    yazi_flavours_path = yazi_plugins_dir.joinpath("flavors")
+    if yazi_plugins_path.exists():
+        if yazi_plugins_path.is_file():
+            yazi_plugins_path.unlink()
+        elif yazi_plugins_path.is_dir():
+            import shutil
+            shutil.rmtree(yazi_plugins_path)
+    yazi_plugins_dir.mkdir(parents=True, exist_ok=True)
+    import git
+    git.Repo.clone_from("https://github.com/yazi-rs/plugins", yazi_plugins_path)
+    if yazi_flavours_path.exists():
+        if yazi_flavours_path.is_file():
+            yazi_flavours_path.unlink()
+        elif yazi_flavours_path.is_dir():
+            import shutil
+            shutil.rmtree(yazi_flavours_path)
+    yazi_plugins_dir.mkdir(parents=True, exist_ok=True)
+    import git
+    git.Repo.clone_from("https://github.com/yazi-rs/flavors", yazi_flavours_path)
+
+    # previewers:
+    if platform.system() == "Linux":
+        script = r"""
+sudo nala install poppler-utils -y || true  # For PDF preview, needed by yazi.
+"""
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script)
+    elif platform.system() == "Darwin":
+        script = r"""
+brew install --upgrade poppler || true  # For PDF preview, needed by yazi.
+"""
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(script)
+    elif platform.system() == "Windows":
+        popler_installer: InstallerData = {
+            "appName": "poppler",
+            "repoURL": "https://github.com/oschwartz10612/poppler-windows",
+            "doc": "PDF rendering library - Windows builds.",
+            "fileNamePattern": {
+                "amd64": {
+                    "windows": "Release-{version}.zip",
+                    "linux": None,
+                    "macos": None,
+                },
+                "arm64": {
+                    "windows": None,
+                    "linux": None,
+                    "macos": None,
+                }
+            }
+        }
+        inst_poppler = Installer(installer_data=popler_installer)
+        inst_poppler.install(version=None)
+    
+    # assuming ouch is already installed
+    script = """
+ya pkg add ndtoan96/ouch  # make ouch default previewer in yazi for compressed files
+ya pkg add AnirudhG07/rich-preview  # rich-cli based previewer for yazi
+ya pack -a stelcodes/bunny
+ya pkg add 'Tyarel8/goto-drives'
+ya pkg add uhs-robert/sshfs
+ya pkg add boydaihungst/file-extra-metadata
+ya pkg add wylie102/duckdb
+
+
+"""
+    from machineconfig.utils.code import run_shell_script
+    run_shell_script(script)
+
+
+if __name__ == "__main__":
+    pass

{machineconfig-7.71 → machineconfig-7.84}/src/machineconfig/jobs/installer/custom_dev/nerdfont.py

@@ -108,4 +108,4 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
 
 
 if __name__ == "__main__":
-    pass
+    main(1, None)  # type: ignore

{machineconfig-7.71 → machineconfig-7.84}/src/machineconfig/jobs/installer/custom_dev/nerfont_windows_helper.py

@@ -71,22 +71,28 @@ 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.
-    
+    """Check which feature fonts are missing from installed fonts.
+
     Args:
         installed_fonts: List of installed font names
-        
+
     Returns:
-        List of missing font patterns
+        List of descriptions for missing font groups
     """
-    import re
 
-    installed_norm = [f.lower().replace(" ", "") for f in installed_fonts]
+    def _normalize(name: str) -> str:
+        return name.lower().replace(" ", "").replace("_", "")
+
+    installed_norm = [_normalize(font) for font in installed_fonts]
+    requirements: list[tuple[str, str]] = [
+        ("cascadiacode", "Cascadia Code family"),
+        ("caskaydiacove", "Caskaydia Cove Nerd Font family"),
+    ]
+
     missing: list[str] = []
-    for pattern in ["cascadiacode*"]:
-        regex = re.compile(pattern)
-        if not any(regex.search(f) for f in installed_norm):
-            missing.append(pattern)
+    for needle, label in requirements:
+        if not any(needle in font for font in installed_norm):
+            missing.append(label)
     return missing
 
 
@@ -123,11 +129,15 @@ def install_nerd_fonts() -> None:
     [p.delete(sure=True) for p in folder.search("*readme*")]
     [p.delete(sure=True) for p in folder.search("*LICENSE*")]
 
+    print("Fonts to be installed:")
+    for font in (folder.search("*.ttf") + folder.search("*.otf")):
+        print(f" - {font}")
+
     console.print("⚙️  Installing fonts via PowerShell...")
     file = PathExtended.tmpfile(suffix=".ps1")
     file.parent.mkdir(parents=True, exist_ok=True)
-    
-    raw_content = LIBRARY_ROOT.joinpath("jobs/installer/pwsh_scripts/install_fonts.ps1").read_text(encoding="utf-8").replace(r".\fonts-to-be-installed", str(folder))
+
+    raw_content = LIBRARY_ROOT.joinpath("jobs/installer/powershell_scripts/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")
@@ -147,3 +157,7 @@ def install_nerd_fonts() -> None:
     console.print()
     render_banner("✅ Nerd Fonts installation complete! ✅", "Nerd Fonts Installer", "green", box.DOUBLE)
     console.print()
+
+
+if __name__ == "__main__":
+    install_nerd_fonts()

{machineconfig-7.71 → machineconfig-7.84}/src/machineconfig/jobs/installer/custom_dev/sysabc.py

@@ -42,7 +42,6 @@ winget install --no-upgrade --name "GNU Nano"                     --Id "GNU.Nano
 # --GROUP:dev2:VSRedistrib+VSBuildTools+Codeblocks+GnuWin32: Make+GnuPG+graphviz+WinFsp+SSHFS-win+xming+Node.js+Rustup+Cloudflare+Cloudflare WARP+Microsoft Garage Mouse without Borders
 # --GROUP:user:nu+Chrome+ChromeRemoteDesktop+Zoom+7zip+Firefox+Thunderbird+StreamlabsOBS+OBSStudio+MiKTeX+TexMaker+notepad+++Lapce+TesseractOCR+perl+DB Browser for SQLite+sql server management studio+Adobe Acrobat Reader DC+julia+Chafa+bottom+onefetch+Just+hyperfine+AWS CLI
 # Install-Module -Name Terminal-Icons -Repository PSGallery -Force -AcceptLicense -PassThru -Confirm  # -RequiredVersion 2.5.10
-# Install-Module -Name PSFzf  -SkipPublisherCheck  # -AcceptLicense -PassThru -Confirm  #  -RequiredVersion 2.5.10
 
 """
 
@@ -50,10 +49,6 @@ zsh = r"""
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 echo "🔄 Updating Homebrew..."
 brew update || true
-echo "📥 Installing essential tools..."
-echo "📥 Installing Git version control..."
-echo "📥 Installing Nano text editor..."
-echo "📥 Installing Node Version Manager (NVM)..."
 # Note: git and nano are pre-installed on macOS, but we install via Homebrew to ensure latest versions
 # brew install git || true
 # brew install nano || true