machineconfig 8.31__tar.gz → 8.47__tar.gz

{machineconfig-8.31/src/machineconfig.egg-info → machineconfig-8.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 8.31
+Version: 8.47
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -11,20 +11,20 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
-Requires-Dist: cryptography>=44.0.2
-Requires-Dist: fire>=0.7.0
+Requires-Dist: cryptography>=46.0.3
+Requires-Dist: fire>=0.7.1
+Requires-Dist: gitpython>=3.1.45
 Requires-Dist: joblib>=1.5.2
-Requires-Dist: paramiko>=3.5.1
+Requires-Dist: paramiko>=4.0.0
+Requires-Dist: psutil>=7.1.3
+Requires-Dist: questionary>=2.1.1
 Requires-Dist: randomname>=0.2.1
+Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: requests>=2.32.5
-Requires-Dist: rich>=14.0.0
+Requires-Dist: rich>=14.2.0
 Requires-Dist: tenacity>=9.1.2
-Requires-Dist: psutil>=7.0.0
-Requires-Dist: gitpython>=3.1.44
-Requires-Dist: rclone-python>=0.1.23
-Requires-Dist: questionary>=2.1.1
-Requires-Dist: typer-slim>=0.19.2
-Requires-Dist: typer>=0.19.2
+Requires-Dist: typer==0.20.0
+Requires-Dist: typer-slim==0.20.0
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot

{machineconfig-8.31 → machineconfig-8.47}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "8.31"
+version = "8.47"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -20,20 +20,20 @@ classifiers = [
 ]
 requires-python = ">=3.13"
 dependencies = [
-    "cryptography>=44.0.2",
-    "fire>=0.7.0",
+    "cryptography>=46.0.3",
+    "fire>=0.7.1",
+    "gitpython>=3.1.45",
     "joblib>=1.5.2",
-    "paramiko>=3.5.1",
+    "paramiko>=4.0.0",
+    "psutil>=7.1.3",
+    "questionary>=2.1.1",
     "randomname>=0.2.1",
+    "rclone-python>=0.1.23",
     "requests>=2.32.5",
-    "rich>=14.0.0",
+    "rich>=14.2.0",
     "tenacity>=9.1.2",
-    "psutil>=7.0.0",
-    "gitpython>=3.1.44",
-    "rclone-python>=0.1.23",
-    "questionary>=2.1.1",
-    "typer-slim>=0.19.2",
-    "typer>=0.19.2",
+    "typer==0.20.0",
+    "typer-slim==0.20.0",
 ]
 
 [project.optional-dependencies]
@@ -90,42 +90,43 @@ dev = [
     "build>=1.3.0",
     "cleanpy>=0.5.1",
     "cowsay>=6.1",
-    # "duckdb-engine>=0.17.0",
+    "duckdb>=1.4.3",
     "gdown>=5.2.0",
     "ipdb>=0.13.13",
-    "ipykernel>=6.30.1",
-    "ipython>=9.5.0",
-    "marimo>=0.17.2",
-    "matplotlib>=3.10.6",
+    "ipykernel>=7.1.0",
+    "ipython>=9.7.0",
+    "marimo>=0.18.3",
+    "matplotlib>=3.10.7",
     "mkdocs>=1.6.1",
-    "mkdocs-autorefs>=1.0.0",
+    "mkdocs-autorefs>=1.4.3",
     "mkdocs-material>=9.7.0",
-    "mkdocstrings[python]>=1.0.0",
-    "mypy>=1.18.2",
-    "numpy>=2.3.3",
+    "mkdocstrings>=1.0.0",
+    "mkdocstrings-python>=2.0.1",
+    "mypy>=1.19.0",
+    "numpy>=2.3.5",
     "pandas>=2.3.3",
-    "plotly>=6.3.0",
-    "polars>=1.34.0",
-    "pre-commit>=4.3.0",
-    "pudb>=2025.1",
-    "pylint>=3.3.8",
+    "plotly>=6.5.0",
+    "polars>=1.35.2",
+    "pre-commit>=4.5.0",
+    "pudb>=2025.1.5",
+    "pylint>=4.0.4",
     "pylsp-mypy>=0.7.0",
-    "pymupdf>=1.26.5",
-    "pypdf>=6.1.1",
-    "pyrefly>=0.33.1",
-    "pyright>=1.1.405",
-    "pytest>=8.4.2",
-    "python-lsp-server[all]>=1.13.1",
+    "pymupdf>=1.26.6",
+    "pypdf>=6.4.1",
+    "pyrefly>=0.45.0",
+    "pyright>=1.1.407",
+    "pytest>=9.0.1",
+    "python-lsp-server>=1.14.0",
     "qrcode>=8.2",
-    "ruff>=0.13.1",
+    "ruff>=0.14.8",
     "ruff-lsp>=0.0.62",
-    "sqlalchemy>=2.0.43",
-    "textual>=6.1.0",
+    "sqlalchemy>=2.0.44",
+    "textual>=6.8.0",
     "trogon>=0.6.0",
-    "ty>=0.0.1a21",
+    "ty>=0.0.1a32",
     "types-mysqlclient>=2.2.0.20250915",
     "types-paramiko>=4.0.0.20250822",
-    "types-pytz>=2025.2.0.20250809",
+    "types-pytz>=2025.2.0.20251108",
     "types-pyyaml>=6.0.12.20250915",
     "types-requests>=2.32.4.20250913",
     "types-sqlalchemy>=1.4.53.38",
@@ -137,11 +138,22 @@ dev = [
 
 other = [
     "duckdb-engine>=0.17.0",
-    "pycrucible>=0.3.0",
-    "vt-py>=0.21.0",
-#     "euporie>=2.8.14",
-#    "py7zr>=1.0.0",
-
+    "pycrucible>=0.3.9",
+    "vt-py>=0.22.0",
+]
+plot = [
+    "duckdb>=1.4.3",
+    "ipykernel>=7.1.0",
+    "ipython>=9.7.0",
+    "jupyterlab>=4.5.0",
+    "kaleido>=1.2.0",
+    "matplotlib>=3.10.7",
+    "nbformat>=5.10.4",
+    "numpy>=2.3.5",
+    "plotly>=6.5.0",
+    "polars>=1.35.2",
+    "python-magic>=0.4.27",
+    "sqlalchemy>=2.0.44",
 ]
 
 

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -4,7 +4,7 @@ from typing import Optional, Literal
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
 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]:
+def get_fire_tab_using_uv(func: FunctionType, tab_weight: int, import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str], start_dir: str) -> tuple[TabConfig, Path]:
     from machineconfig.utils.meta import lambda_to_python_script
     if func.__name__ == "<lambda>":
         py_script =  lambda_to_python_script(func,
@@ -16,12 +16,12 @@ def get_fire_tab_using_uv(func: FunctionType, tab_weight: int, import_module: bo
     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)
     tab_config: TabConfig = {
         "command": command_to_run,
-        "startDir": "$HOME",
+        "startDir": start_dir,
         "tabName": func.__name__,
         "tabWeight": tab_weight
     }
     return tab_config, py_script_path
-def get_fire_tab_using_fire(func: FunctionType, tab_weight: int) -> TabConfig:
+def get_fire_tab_using_fire(func: FunctionType, tab_weight: int, start_dir: str) -> TabConfig:
     import inspect
     from machineconfig.utils.source_of_truth import CONFIG_ROOT
     import platform
@@ -37,7 +37,7 @@ def get_fire_tab_using_fire(func: FunctionType, tab_weight: int) -> TabConfig:
     command_to_run = f"""{wrap_mcfg} fire {path_relative} {func.__name__} """
     tab_config: TabConfig = {
         "command": command_to_run,
-        "startDir": "$HOME",
+        "startDir": start_dir,
         "tabName": func.__name__,
         "tabWeight": tab_weight
     }
@@ -45,20 +45,22 @@ def get_fire_tab_using_fire(func: FunctionType, tab_weight: int) -> TabConfig:
 
 
 
-def make_layout_from_functions(functions: list[FunctionType], functions_weights: Optional[list[int]], import_module: bool, tab_configs: list[TabConfig],
+def make_layout_from_functions(functions: list[FunctionType], functions_weights: Optional[list[int]],
+                               import_module: bool, tab_configs: list[TabConfig],
                                layout_name: str, method: Literal["script", "fire"],
-                               uv_with: Optional[list[str]] = None, uv_project_dir: Optional[str] = None
+                               uv_with: Optional[list[str]], uv_project_dir: Optional[str],
+                               start_dir: str
                                ) -> LayoutConfig:
     tabs2artifacts: list[tuple[TabConfig, list[Path]]] = []
     for a_func, tab_weight in zip(functions, functions_weights or [1]*len(functions)):
         match method:
             case "script":
                 tab_config, artifact_files_1 = get_fire_tab_using_uv(a_func, tab_weight=tab_weight, import_module=import_module,
-                                                                     uv_with=uv_with, uv_project_dir=uv_project_dir
+                                                                     uv_with=uv_with, uv_project_dir=uv_project_dir, start_dir=start_dir
                                                                      )
                 artifact_files = [artifact_files_1]
             case "fire":
-                tab_config = get_fire_tab_using_fire(a_func, tab_weight=tab_weight)
+                tab_config = get_fire_tab_using_fire(a_func, tab_weight=tab_weight, start_dir=start_dir)
                 artifact_files = []
         tabs2artifacts.append((tab_config, artifact_files))
     list_of_tabs = [tab for tab, _ in tabs2artifacts] + tab_configs

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/cluster/sessions_managers/wt_local.py

@@ -206,7 +206,7 @@ if __name__ == "__main__":
     sample_layout: LayoutConfig = {"layoutName": "TestLayout",
                                    "layoutTabs": [
             {"tabName": "Frontend", "startDir": "~/code", "command": "btm"},
-            {"tabName": "Monitor", "startDir": "~", "command": "lf"}
+            {"tabName": "Monitor", "startDir": "~", "command": "yazi"},
             ]}
     try:
         session_name = sample_layout["layoutName"]

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/cluster/sessions_managers/zellij_local.py

@@ -206,7 +206,7 @@ if __name__ == "__main__":
     # Example usage with new schema
     sample_layout: LayoutConfig = {
         "layoutName": "SampleBots",
-        "layoutTabs": [{"tabName": "Explorer", "startDir": "~/code", "command": "lf"}, {"tabName": "🤖Bot2", "startDir": "~", "command": "cmatrix"}, {"tabName": "📊Monitor", "startDir": "~", "command": "htop"}, {"tabName": "📝Logs", "startDir": "/var/log", "command": "tail -f /var/log/app.log"}],
+        "layoutTabs": [{"tabName": "Explorer", "startDir": "~/code", "command": "yazi"}, {"tabName": "🤖Bot2", "startDir": "~", "command": "cmatrix"}, {"tabName": "📊Monitor", "startDir": "~", "command": "htop"}, {"tabName": "📝Logs", "startDir": "/var/log", "command": "tail -f /var/log/app.log"}],
     }
     try:
         # Create layout using the generator with new design

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/installer/installer_data.json

@@ -1590,12 +1590,12 @@
         "amd64": {
           "linux": "dbeaver-ce-{version}-linux.gtk.x86_64.tar.gz",
           "macos": "dbeaver-ce-{version}-macos-x86_64.dmg",
-          "windows": "dbeaver-ce-{version}-x86_64-setup.exe"
+          "windows": "winget install DBeaver.DBeaver.Community --source winget --scope user --accept-package-agreements --accept-source-agreements"
         },
         "arm64": {
           "linux": "dbeaver-ce-{version}-linux.gtk.aarch64.tar.gz",
           "macos": "dbeaver-ce-{version}-macos-aarch64.dmg",
-          "windows": "dbeaver-ce-{version}-win32.win32.aarch64.zip"
+          "windows": "winget install DBeaver.DBeaver.Community --source winget --scope user --accept-package-agreements --accept-source-agreements"
         }
       }
     },

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/installer/linux_scripts/docker.sh

@@ -109,15 +109,12 @@ echo """✅ INSTALLATION COMPLETE | Docker has been installed successfully
   For systemd systems: systemctl start dockerd
   For WSL without systemd: sudo service docker start
 - For more information, visit: https://docs.docker.com/engine/install/linux-postinstall/
+
+sudo systemctl start docker
+sudo systemctl enable docker
+sudo usermod -aG docker alex
+logout
+
 """
 
 # Additional notes:
-# - In older WSL, after installation, 'docker run hello-world' may fail with connection error
-#   See: https://stackoverflow.com/questions/44678725/cannot-connect-to-the-docker-daemon-at-unix-var-run-docker-sock-is-the-docker
-# 
-# - No internet in WSL docker instance: add /etc/docker/daemon.json
-#   See: https://github.com/MicrosoftDocs/WSL/issues/422
-# 
-# - For Databricks environments only:
-#   sudo nala install fuse-overlayfs
-

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/installer/package_groups.py

@@ -225,7 +225,7 @@ PACKAGES_FILE = [
 PACKAGES_TERMINAL_SHELL = [
     "zellij",
     "mprocs",
-    "mcfly",
+    # "mcfly",
     "atuin",
     "starship",
     "gotty",

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/installer/python_scripts/hx.py

@@ -14,7 +14,7 @@ from rich.panel import Panel
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-LANGUAGES_SUPPORTED = ["python", "nu", "bash", "lua", "powershell"]
+LANGUAGES_SUPPORTED = ["python", "nu", "bash", "lua", "powershell", "json", "json5", "toml", "ini", "yaml", "markdown", "markdoc", "markdown_inline"]
 config_dict: InstallerData = {
     "appName": "hx",
     "repoURL": "CMD",

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/installer/python_scripts/sysabc.py

@@ -37,6 +37,7 @@ else {
 
 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 "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 "Git"                          --Id "Git.Git"                    --source winget --scope user --accept-package-agreements --accept-source-agreements
 powershell -c "irm bun.sh/install.ps1|iex"
 
 # --GROUP:gui:Brave+VSCode+Git+WezTerm
@@ -85,7 +86,9 @@ sudo nala install build-essential python3-dev -y || true  # C build toolchain: W
 sudo nala install unzip -y  # required by bun installer
 curl -fsSL https://bun.com/install | bash
 . ~/.bashrc || true
-sudo ln -s $(which bun) /usr/local/bin/node  # trick programs that expect node to use bun runtime.
+# sudo ln -s $(which bun) /usr/local/bin/node  # trick programs that expect node to use bun runtime.
+sudo ln -s ~/.bun/bin/bun /usr/local/bin/node
+
 
 sudo nala install samba -y || true
 sudo nala install fuse3 -y || true

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/installer/python_scripts/yazi.py

@@ -1,5 +1,5 @@
 
-from typing import Optional
+from typing import Optional, Any, Callable
 import platform
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
@@ -47,26 +47,42 @@ def main(installer_data: InstallerData, version: Optional[str]):
     
     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)
+    import shutil
+    import os
+    import stat
+    import time
+
+    def on_rm_error(_func: Callable[..., Any], path: str, exc: BaseException) -> None:
+        os.chmod(path, stat.S_IWRITE)
+        try:
+            os.unlink(path)
+        except Exception:
+            pass
+
+    def force_remove(path: Path) -> None:
+        if path.exists():
+            if path.is_file():
+                path.unlink()
+            elif path.is_dir():
+                shutil.rmtree(path, onexc=on_rm_error)
+                if path.exists():
+                    time.sleep(0.1)
+                    shutil.rmtree(path, ignore_errors=True)
+
+    force_remove(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)
+
+    force_remove(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:
+    from machineconfig.utils.installer_utils.installer_cli import install_if_missing
+    install_if_missing("glow")
+    install_if_missing("duckdb")
     if platform.system() == "Linux":
         script = r"""
 sudo nala install poppler-utils -y || true  # For PDF preview, needed by yazi.
@@ -80,7 +96,6 @@ 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":
-        from machineconfig.utils.installer_utils.installer_cli import install_if_missing
         install_if_missing("git")
         install_if_missing("7zip")
         popler_installer: InstallerData = {
@@ -104,15 +119,15 @@ brew install --upgrade poppler || true  # For PDF preview, needed by yazi.
         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 pkg -a 'stelcodes/bunny'
+ya pkg add '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)

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/jobs/scripts/powershell_scripts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=8.31" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=8.47" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local

{machineconfig-8.31 → machineconfig-8.47}/src/machineconfig/profile/create_links.py

@@ -19,54 +19,111 @@ from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
 import platform
 import subprocess
 import tomllib
-from typing import Optional, Any, TypedDict, Literal
+from typing import Optional, Any, TypedDict, Literal, TypeAlias
+from pathlib import Path
 
 
+LIBRARY_MAPPER_PATH = LIBRARY_ROOT.joinpath("profile/mapper_dotfiles.toml")
+USER_MAPPER_PATH  = Path.home().joinpath("dotfiles/machineconfig/mapper_dotfiles.toml")
+
 system = platform.system()  # Linux or Windows
 ERROR_LIST: list[Any] = []  # append to this after every exception captured.
 SYSTEM = system.lower()
 
 console = Console()
 
+OS_ALIASES = {
+    "mac": "darwin",
+    "macos": "darwin",
+    "osx": "darwin",
+}
+REPO_ALIASES = {
+    "l": "library",
+    "i": "user",
+}
+
+
+def _normalize_os_name(value: str) -> str:
+    return OS_ALIASES.get(value.strip().lower(), value.strip().lower())
+
+
+def _normalize_repo_name(value: str) -> str:
+    return REPO_ALIASES.get(value.strip().lower(), value.strip().lower())
+
+
+def _parse_os_field(os_field: Any) -> set[str]:
+    if not os_field:
+        return {"any"}
+    if isinstance(os_field, list):
+        raw_values = [str(item) for item in os_field]
+    else:
+        raw_values = str(os_field).split(",")
+    values: set[str] = set()
+    for raw in raw_values:
+        token = _normalize_os_name(raw)
+        if not token:
+            continue
+        if token in {"any", "all", "*"}:
+            return {"any"}
+        values.add(token)
+    return values or {"any"}
+
 
 class Base(TypedDict):
     original: str
     self_managed: str
     contents: Optional[bool]
     copy: Optional[bool]
+    os: Optional[str]
 class ConfigMapper(TypedDict):
     file_name: str
     config_file_default_path: str
     self_managed_config_file_path: str
     contents: Optional[bool]
     copy: Optional[bool]
+    os: Optional[str]
 class MapperFileData(TypedDict):
     public: dict[str, list[ConfigMapper]]
     private: dict[str, list[ConfigMapper]]
-def read_mapper() -> MapperFileData:
-    mapper_data: dict[str, dict[str, Base]] = tomllib.loads(LIBRARY_ROOT.joinpath("profile/mapper.toml").read_text(encoding="utf-8"))
+
+RepoLoose: TypeAlias = Literal["user", "library", "all"]
+
+
+def read_mapper(repo: RepoLoose) -> MapperFileData:
+    repo_key = _normalize_repo_name(repo)
+    match repo_key:
+        case "user":
+            mapper_path = USER_MAPPER_PATH
+        case "library":
+            mapper_path = LIBRARY_MAPPER_PATH
+        case "all":
+            # Merge both mappers
+            if not USER_MAPPER_PATH.exists():
+                user_mapper = {"public": {}, "private": {}}
+            else:
+                user_mapper = read_mapper(repo="user")
+            library_mapper = read_mapper(repo="library")
+            merged_public: dict[str, list[ConfigMapper]] = {**library_mapper["public"], **user_mapper["public"]}
+            merged_private: dict[str, list[ConfigMapper]] = {**library_mapper["private"], **user_mapper["private"]}
+            return {"public": merged_public, "private": merged_private}
+        case _:
+            raise ValueError(f"Unsupported repo value: {repo}")
+    mapper_data: dict[str, dict[str, Base]] = tomllib.loads(mapper_path.read_text(encoding="utf-8"))
     public: dict[str, list[ConfigMapper]] = {}
     private: dict[str, list[ConfigMapper]] = {}
-    # def get_other_systems(current_system: str) -> list[str]:
-    #     all_systems = ["linux", "windows", "darwin"]
-    #     return [s for s in all_systems if s != current_system.lower()]
-    # OTHER_SYSTEMS = get_other_systems(SYSTEM)
+    normalized_system = _normalize_os_name(SYSTEM)
     for program_key, program_map in mapper_data.items():
-        parts = program_key.split("_")
-        if len(parts) > 1:
-            if parts[-1].lower() == "windows" and SYSTEM != "windows":
-                # console.print(f"Skipping Windows-only program mapping: {program_key}")
-                continue
-            elif parts[-1].lower() == "linux" and SYSTEM == "windows":
-                # console.print(f"Skipping Linux-only program mapping: {program_key}")
-                continue
         for file_name, file_base in program_map.items():
+            os_values = _parse_os_field(file_base.get("os"))
+            if "any" not in os_values and normalized_system not in os_values:
+                continue
             file_map: ConfigMapper = {
                 "file_name": file_name,
                 "config_file_default_path": file_base["original"],
                 "self_managed_config_file_path": file_base["self_managed"],
                 "contents": file_base.get("contents"),
                 "copy": file_base.get("copy"),
+                "os": file_base.get("os"),
             }
             if "CONFIG_ROOT" in file_map["self_managed_config_file_path"]:
                 if program_key not in public: