machineconfig 5.37__tar.gz → 5.39__tar.gz

{machineconfig-5.37/src/machineconfig.egg-info → machineconfig-5.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.37
+Version: 5.39
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -9,7 +9,7 @@ Project-URL: Bug Tracker, https://github.com/thisismygitrepo/machineconfig/issue
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.13
+Requires-Python: <3.14,>=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: fire>=0.7.0
@@ -24,9 +24,9 @@ Requires-Dist: gitpython>=3.1.44
 Requires-Dist: pyfzf>=0.3.1
 Requires-Dist: rclone-python>=0.1.23
 Requires-Dist: pyjson5>=1.6.9
-Requires-Dist: typer-slim>=0.19.2
 Requires-Dist: questionary>=2.1.1
-Requires-Dist: typer>=0.19.2
+Requires-Dist: typer-slim>=0.19.2
+Requires-Dist: euporie>=2.8.14
 Provides-Extra: windows
 Requires-Dist: pywin32; extra == "windows"
 Provides-Extra: plot
@@ -86,5 +86,9 @@ iex (iwr bit.ly/cfgwindows).Content
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 
+# Contributor
+Ruby Chan. [email](mailto:ruby.chan@sa.gov.au)
+
+
 [![Alex's github activity graph](https://github-readme-activity-graph.vercel.app/graph?username=thisismygitrepo)](https://github.com/ashutosh00710/github-readme-activity-graph)
 

{machineconfig-5.37 → machineconfig-5.39}/README.md

@@ -41,5 +41,9 @@ iex (iwr bit.ly/cfgwindows).Content
 # Author
 Alex Al-Saffar. [email](mailto:programmer@usa.com)
 
+# Contributor
+Ruby Chan. [email](mailto:ruby.chan@sa.gov.au)
+
+
 [![Alex's github activity graph](https://github-readme-activity-graph.vercel.app/graph?username=thisismygitrepo)](https://github.com/ashutosh00710/github-readme-activity-graph)
 

{machineconfig-5.37 → machineconfig-5.39}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.37"
+version = "5.39"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -18,7 +18,7 @@ classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
 ]
-requires-python = ">=3.13"
+requires-python = ">=3.13,<3.14"
 dependencies = [
     "cryptography>=44.0.2",
     "fire>=0.7.0",
@@ -33,9 +33,9 @@ dependencies = [
     "pyfzf>=0.3.1",
     "rclone-python>=0.1.23",
     "pyjson5>=1.6.9",
-    "typer-slim>=0.19.2",
     "questionary>=2.1.1",
-    "typer>=0.19.2",
+    "typer-slim>=0.19.2",
+    "euporie>=2.8.14",
 ]
 
 [project.optional-dependencies]
@@ -93,9 +93,12 @@ dev = [
     "ipdb>=0.13.13",
     "ipykernel>=6.30.1",
     "ipython>=9.5.0",
+    "marimo>=0.16.5",
     "matplotlib>=3.10.6",
     "mypy>=1.18.2",
+    "nuitka>=2.7.16",
     "numpy>=2.3.3",
+    "pandas>=2.3.3",
     "plotly>=6.3.0",
     "polars>=1.33.1",
     "pre-commit>=4.3.0",

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/cluster/remote/script_execution.py

@@ -169,7 +169,6 @@
 # if params.session_name != "":
 #     if platform.system() in ["Linux", "Darwin"]:
 #         Terminal().run(f"""zellij --session {params.session_name} action new-tab --name results  """)
-#         # --layout ~/code/machineconfig/src/machineconfig/settings/zellij/layouts/d.kdl --cwd {res_folder.as_posix()}
 #         Terminal().run(f"""zellij --session {params.session_name} action write-chars "cd {res_folder.as_posix()};lf" """)
 #     elif platform.system() == "Windows":
 #         Terminal().run(f"""wt --window {params.session_name} new-tab --title results -startingDirectory {res_folder.as_posix()} lf """)

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/cluster/sessions_managers/zellij_utils/process_monitor.py

@@ -51,12 +51,10 @@ class ProcessMonitor:
             return {"status": "unknown", "error": f"Tab '{tab_name}' not found in layout config", "running": False, "command": "", "tab_name": tab_name, "processes": [], "remote": self.remote_executor.remote_name}
 
         command = tab_config["command"]
-
         try:
             check_script = self._create_process_check_script(command)
-            remote_cmd = f"$HOME/code/machineconfig/.venv/bin/python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin devops self run-python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
-
             if result.returncode == 0:
                 try:
                     matching_processes = json.loads(result.stdout.strip())
@@ -145,7 +143,7 @@ if __name__ == "__main__":
             check_timestamp = timestamp_result.stdout.strip() if timestamp_result.returncode == 0 else "unknown"
 
             check_script = self._create_fresh_check_script(command)
-            remote_cmd = f"$HOME/code/machineconfig/.venv/bin/python -c {shlex.quote(check_script)}"
+            remote_cmd = f"$HOME/.local/bin/devops self run-python -c {shlex.quote(check_script)}"
             result = self.remote_executor.run_command(remote_cmd, timeout=15)
 
             if result.returncode == 0:

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/jobs/installer/check_installations.py

@@ -1,9 +1,9 @@
 
 import platform
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 
 
-APP_SUMMARY_PATH = LIBRARY_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
+APP_SUMMARY_PATH = CONFIG_ROOT.joinpath(f"profile/records/{platform.system().lower()}/apps_summary_report.csv")
 # CLOUD: str = "gdw"  # Read.ini(DEFAULTS_PATH)['general']['rclone_config_name']
 # # my onedrive doesn't allow sharing.
 

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/jobs/installer/custom_dev/nerfont_windows_helper.py

@@ -25,14 +25,14 @@ nerd_fonts: InstallerData = {
     "doc": "Nerd Fonts is a project that patches developer targeted fonts with a high number of glyphs (icons)",
     "fileNamePattern": {
         "amd64": {
-            "windows": "CaskaydiaCoveNerdFontWindows.zip",
-            "linux": "CaskaydiaCoveNerdFontLinux.zip",
-            "macos": "CaskaydiaCoveNerdFontMac.zip",
+            "windows": "CascadiaCode.zip",
+            "linux": "CascadiaCode.zip",
+            "macos": "CascadiaCode.zip",
         },
         "arm64": {
-            "windows": "CaskaydiaCoveNerdFontWindows.zip",
-            "linux": "CaskaydiaCoveNerdFontLinux.zip",
-            "macos": "CaskaydiaCoveNerdFontMac.zip",
+            "windows": "CascadiaCode.zip",
+            "linux": "CascadiaCode.zip",
+            "macos": "CascadiaCode.zip",
         }
     }
 }
@@ -40,10 +40,10 @@ nerd_fonts: InstallerData = {
 
 # 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)"
+# )
 
 
 console = Console()
@@ -92,7 +92,7 @@ def _missing_required_fonts(installed_fonts: Iterable[str]) -> list[str]:
 
     installed_norm = [f.lower().replace(" ", "") for f in installed_fonts]
     missing: list[str] = []
-    for pattern in REQUIRED_FONT_PATTERNS:
+    for pattern in ["cascadiacode*"]:
         regex = re.compile(pattern)
         if not any(regex.search(f) for f in installed_norm):
             missing.append(pattern)
@@ -136,7 +136,7 @@ def install_nerd_fonts() -> None:
     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))
+    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))
     # 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")

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/jobs/installer/installer_data.json

@@ -188,6 +188,40 @@
         }
       }
     },
+    {
+      "appName": "croc",
+      "repoURL": "https://github.com/schollz/croc",
+      "doc": "🦎 Easily and securely send things from one computer to another",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "croc_{version}_Linux-64bit.tar.gz",
+          "windows": "croc_{version}_Windows-64bit.zip",
+          "macos": "croc_{version}_macOS-64bit.tar.gz"
+        },
+        "arm64": {
+          "linux": "croc_{version}_Linux-ARM64.tar.gz",
+          "windows": null,
+          "macos": "croc_{version}_macOS-ARM64.tar.gz"
+        }
+      }
+    },
+    {
+      "appName": "wormhole-rs",
+      "repoURL": "https://github.com/magic-wormhole/magic-wormhole.rs",
+      "doc": "🐛 Get things from one computer to another, safely (Rust implementation)",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "magic-wormhole-cli-x86_64-unknown-linux-gnu.tgz",
+          "windows": "magic-wormhole-cli-x86_64-pc-windows-gnu.tgz",
+          "macos": "magic-wormhole-cli-aarch64-apple-darwin.tgz"
+        },
+        "arm64": {
+          "linux": null,
+          "windows": null,
+          "macos": null
+        }
+      }
+    },
     {
       "appName": "easy-sharing",
       "repoURL": "CMD",
@@ -1328,9 +1362,9 @@
       }
     },
     {
-      "appName": "bitwarden",
+      "appName": "bw",
       "repoURL": "CMD",
-      "doc": "🔐 bw is a password manager.",
+      "doc": "🔐 bitwarden is a password manager.",
       "fileNamePattern": {
         "amd64": {
           "linux": "npm install -g @bitwarden/cli",
@@ -1752,6 +1786,23 @@
         }
       }
     },
+    {
+      "appName": "docker",
+      "repoURL": "CMD",
+      "doc": "🐳 Docker is an open platform for developing, shipping, and running applications.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "docker.sh",
+          "macos": "docker.sh",
+          "windows": null
+        },
+        "arm64": {
+          "linux": "docker.sh",
+          "macos": "docker.sh",
+          "windows": null
+        }
+      }
+    },
     {
       "appName": "lazydocker",
       "repoURL": "https://github.com/jesseduffield/lazydocker",

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/jobs/windows/archive/archive_pygraphviz.ps1

@@ -5,9 +5,7 @@
 # winget install Microsoft.VC++2015-2022Redist-x86
 
 
-. "$env:USERPROFILE\code\machineconfig\.venv\Scripts\Activate.ps1"
-Set-Location C:
-python -m pip install --global-option=build_ext --global-option="-IC:\Program Files\Graphviz\include" --global-option="-LC:\Program Files\Graphviz\lib" pygraphviz
+uv pip install --global-option=build_ext --global-option="-IC:\Program Files\Graphviz\include" --global-option="-LC:\Program Files\Graphviz\lib" pygraphviz
 # not including the options as above (from https://pygraphviz.github.io/documentation/stable/install.html)
 # would result in an error like this: pygraphviz/graphviz_wrap.c(2711): fatal error C1083: Cannot open include file: 'graphviz/cgraph.h': No such file or directory
 

machineconfig-5.39/src/machineconfig/profile/create_helper.py

@@ -0,0 +1,26 @@
+
+from typing import Literal
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
+
+
+def copy_assets_to_machine(which: Literal["scripts", "settings"]):
+    # callers, symlink public, shell profile adder (requires init.ps1 and scripts dir to be present on machine)
+    import platform
+    if platform.system().lower() == "windows":
+        system = "windows"
+    elif platform.system().lower() == "linux" or platform.system().lower() == "darwin":
+        system = "linux"
+    else:
+        raise NotImplementedError(f"System {platform.system().lower()} not supported")
+    match which:
+        case "scripts":
+            source = LIBRARY_ROOT.joinpath("scripts", system)
+            target = CONFIG_ROOT.joinpath("scripts", system)
+        case "settings":
+            source = LIBRARY_ROOT.joinpath("settings", system)
+            target = CONFIG_ROOT.joinpath("settings", system)
+    from machineconfig.utils.path_extended import PathExtended
+    PathExtended(source).copy(folder=target.parent)
+    PathExtended(source).copy(folder=target.parent)
+
+

machineconfig-5.37/src/machineconfig/profile/create.py → machineconfig-5.39/src/machineconfig/profile/create_links.py

@@ -13,7 +13,7 @@ from rich.table import Table
 
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.links import symlink_map, copy_map
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_PATH
+from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_ROOT
 
 import platform
 import subprocess
@@ -63,7 +63,7 @@ def read_mapper() -> MapperFileData:
                 "contents": file_base.get("contents"),
                 "copy": file_base.get("copy"),
             }
-            if "LIBRARY_ROOT" in file_map["self_managed_config_file_path"]:
+            if "CONFIG_ROOT" in file_map["self_managed_config_file_path"]:
                 if program_key not in public:
                     public[program_key] = []
                 public[program_key].append(file_map)
@@ -107,7 +107,7 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
         console.rule(f"🔄 Processing [bold]{program_name}[/] symlinks", style="cyan")
         for a_mapper in program_files:
             config_file_default_path = PathExtended(a_mapper["config_file_default_path"])
-            self_managed_config_file_path = PathExtended(a_mapper["self_managed_config_file_path"].replace("LIBRARY_ROOT", LIBRARY_ROOT.as_posix()))
+            self_managed_config_file_path = PathExtended(a_mapper["self_managed_config_file_path"].replace("CONFIG_ROOT", CONFIG_ROOT.as_posix()))
             
             # Determine whether to use copy or symlink
             use_copy = method == "copy" or a_mapper.get("copy", False)
@@ -215,7 +215,7 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
 
     if system == "Linux":
         console.print("\n[bold]📜 Setting executable permissions for scripts...[/bold]")
-        subprocess.run(f"chmod +x {LIBRARY_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
+        subprocess.run(f"chmod +x {CONFIG_ROOT.joinpath(f'scripts/{system.lower()}')} -R", shell=True, capture_output=True, text=True)
         console.print("[green]✅ Script permissions updated[/green]")
 
     # Display operation summary table
@@ -250,8 +250,8 @@ def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
         # Export operation records to CSV
         import csv
         from datetime import datetime
-        
-        csv_dir = PathExtended(CONFIG_PATH).joinpath("symlink_operations")
+
+        csv_dir = PathExtended(CONFIG_ROOT).joinpath("symlink_operations")
         csv_dir.mkdir(parents=True, exist_ok=True)
         
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")

machineconfig-5.37/src/machineconfig/profile/create_frontend.py → machineconfig-5.39/src/machineconfig/profile/create_links_export.py

@@ -1,7 +1,6 @@
 
 import typer
 from typing import Optional, Literal
-from pathlib import Path
 
 
 def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..., help="Method to use for setting up the config file."),
@@ -12,12 +11,7 @@ def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..
     SOURCE = Self-Managed-Config-File-Path
     TARGET = Config-File-Default-Path
     For public config files, the source always exists, because we know it comes from machineconfig repo."""
-    from machineconfig.profile.create import ConfigMapper, read_mapper
-    if method == "symlink":
-        machineconfig_repo_path = Path.home().joinpath("code/machineconfig")
-        if not machineconfig_repo_path.exists() or not machineconfig_repo_path.is_dir():
-            raise FileNotFoundError(f"machineconfig repo not found at {machineconfig_repo_path}. Cannot create symlinks to non-existing source files.")
-
+    from machineconfig.profile.create_links import ConfigMapper, read_mapper
     mapper_full = read_mapper()["public"]
     if which is None:
         assert interactive is True
@@ -31,7 +25,9 @@ def main_public_from_parser(method: Literal["symlink", "copy"] = typer.Option(..
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
 
-    from machineconfig.profile.create import apply_mapper
+    from machineconfig.profile.create_links import apply_mapper
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine(which="settings")  # config files live here and will be linked to.
     apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)
 
 
@@ -39,7 +35,7 @@ def main_private_from_parser(method: Literal["symlink", "copy"] = typer.Option(.
                              on_conflict: Literal["throwError", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"] = typer.Option("throwError", help="Action to take on conflict"),
                              which: Optional[str] = typer.Option(None, help="Specific items to process"),
                              interactive: bool = typer.Option(False, help="Run in interactive mode")):
-    from machineconfig.profile.create import ConfigMapper, read_mapper
+    from machineconfig.profile.create_links import ConfigMapper, read_mapper
 
     mapper_full = read_mapper()["private"]
     if which is None:
@@ -54,5 +50,5 @@ def main_private_from_parser(method: Literal["symlink", "copy"] = typer.Option(.
             items_chosen = which.split(",")
     items_objections: dict[str, list[ConfigMapper]] = {item: mapper_full[item] for item in items_chosen if item in mapper_full}
 
-    from machineconfig.profile.create import apply_mapper
+    from machineconfig.profile.create_links import apply_mapper
     apply_mapper(mapper_data=items_objections, on_conflict=on_conflict, method=method)

machineconfig-5.37/src/machineconfig/profile/shell.py → machineconfig-5.39/src/machineconfig/profile/create_shell_profile.py

@@ -1,8 +1,7 @@
 """shell"""
 
-from typing import Literal
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.source_of_truth import LIBRARY_ROOT, CONFIG_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 
 import platform
 import os
@@ -36,51 +35,27 @@ def get_shell_profile_path() -> PathExtended:
     return profile_path
 
 
-def create_default_shell_profile(method: Literal["copy", "reference"]) -> None:
-    if method == "reference":
-        machineconfig_repo_path = PathExtended.home().joinpath("code/machineconfig")
-        if not machineconfig_repo_path.exists() or not machineconfig_repo_path.is_dir():
-            raise FileNotFoundError(f"machineconfig repo not found at {machineconfig_repo_path}. Cannot create symlinks to non-existing source files.")
-
+def create_default_shell_profile() -> None:
     shell_profile_path = get_shell_profile_path()
     shell_profile = shell_profile_path.read_text(encoding="utf-8")
 
-    if system == "Windows":
-        init_script = PathExtended(LIBRARY_ROOT).joinpath("settings/shells/pwsh/init.ps1")
-
-        init_script_copy_path = PathExtended(CONFIG_PATH).joinpath("profile/init.ps1").collapseuser()
-        init_script_copy_path.parent.mkdir(parents=True, exist_ok=True)
-        init_script.copy(path=init_script_copy_path, overwrite=True)
+    from machineconfig.profile.create_helper import copy_assets_to_machine
+    copy_assets_to_machine("settings")  # init.ps1 or init.sh live here
+    copy_assets_to_machine("scripts")  # init scripts are going to reference those scripts.
 
-        source_using_copy = f""". {str(init_script_copy_path).replace("~", "$HOME")}"""
-        source_using_reference = f""". {str(init_script.collapseuser()).replace("~", "$HOME")}"""
+    if system == "Windows":
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/pwsh/init.ps1")
+        source_line = f""". {str(init_script.collapseuser()).replace("~", "$HOME")}"""
     else:
-        init_script = PathExtended(LIBRARY_ROOT).joinpath("settings/shells/bash/init.sh")
-        init_script_copy_path = PathExtended(CONFIG_PATH).joinpath("profile/init.sh").collapseuser()
-        init_script_copy_path.parent.mkdir(parents=True, exist_ok=True)
-        init_script.copy(path=init_script_copy_path, overwrite=True)
-
-        source_using_reference = f"""source {str(init_script.collapseuser()).replace("~", "$HOME")}"""
-        source_using_copy = f"""source {str(init_script_copy_path).replace("~", "$HOME")}"""
-
-    match method:
-        case "copy":
-            line_of_interest = source_using_copy
-            line_other = source_using_reference
-        case "reference":
-            line_of_interest = source_using_reference
-            line_other = source_using_copy
+        init_script = PathExtended(CONFIG_ROOT).joinpath("settings/shells/bash/init.sh")
+        source_line = f"""source {str(init_script).replace("~", "$HOME")}"""
 
     was_shell_updated = False
-    if line_other in shell_profile:  # always remove this irrelevant line
-        shell_profile = shell_profile.replace(line_other, "")
-        was_shell_updated = True
-
-    if line_of_interest in shell_profile:
+    if source_line in shell_profile:
         console.print(Panel("🔄 PROFILE | Skipping init script sourcing - already present in profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))        
     else:
         console.print(Panel("📝 PROFILE | Adding init script sourcing to profile", title="[bold blue]Profile[/bold blue]", border_style="blue"))
-        shell_profile += "\n" + line_of_interest + "\n"
+        shell_profile += "\n" + source_line + "\n"
         if system == "Linux":
             result = subprocess.run(["cat", "/proc/version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=False)
             if result.returncode == 0 and result.stdout:

{machineconfig-5.37/src/machineconfig/scripts/linux → machineconfig-5.39/src/machineconfig/scripts/linux/other}/share_cloud.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# https://temp.sh/
 # 📤 CLOUD FILE SHARING SCRIPT 📤
 # This script uploads files or directories to transfer.sh for easy sharing
 # Usage: share_cloud <file|directory> or command | share_cloud <file_name>
@@ -14,6 +15,8 @@ if [ $# -eq 0 ]; then
     return 1
 fi
 
+# https://temp.sh/
+
 # Process the input
 if tty -s; then
     # Direct file/directory upload mode

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/linux/z_ls

@@ -40,11 +40,11 @@ fi
 if [[ "${ZJ_SESSIONS}" == *"(current)"* ]]; then
     # if so, then we are in a zellijsession
     echo "already inside a session, existing."
-    COMMANDS=$(ls $HOME/code/machineconfig/src/machineconfig/settings/zellij/commands)
+    COMMANDS=$(ls $HOME/.config/machineconfig/settings/zellij/commands)
     # fzf the results
     res="$(echo -e "${COMMANDS}" | fzf --ansi)"
     # run the bash fiZJ_SESSIONSle chosen
-    bash $HOME/code/machineconfig/src/machineconfig/settings/zellij/commands/$res
+    bash $HOME/.config/machineconfig/settings/zellij/commands/$res
 
 else # ==> we are not in a zellijsession
   if [ "${NO_SESSIONS}" -ge 1 ]; then  # sessions do exist

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/agents.py

@@ -103,7 +103,6 @@ def create(
     layoutfile = get_agents_launch_layout(session_root=agents_dir)    
     regenerate_py_code = f"""
 #!/usr/bin/env uv run --python 3.13 --with machineconfig
-#!/usr/bin/env uv run --no-dev --project $HOME/code/machineconfig
 fire_agents create --context-path "{prompt_material_path}" \\
     --{search_strategy} "{context_path or keyword_search or filename_pattern}" \\
     --prompt-path "{prompt_path or ''}" \\

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/ai/initai.py

@@ -23,12 +23,11 @@ uv init --python 3.13
 uv venv
 uv add --upgrade-package pylint pyright mypy pyrefly ty --dev  # linters and type checkers
 uv add --upgrade-package pytest --dev
-# uv add typer --dev
+uv add typer --dev
 
 """
-            import subprocess
-
-            subprocess.run(command_to_run, shell=True, check=True)
+            from machineconfig.utils.code import run_shell_script
+            run_shell_script(command_to_run)
         else:
             print("Terminating initai ...")
             return

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/ai/scripts/lint_and_type_check.ps1

@@ -66,7 +66,6 @@ uv run -m cleanpy .
 uv run -m ruff clean
 # uv run -m ruff format .
 uv run -m ruff check . --fix
-uv run --no-dev --project $HOME/code/machineconfig -m machineconfig.scripts.python.ai.generate_files
 
 New-Item -ItemType Directory -Force -Path .ai/linters | Out-Null
 

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/ai/scripts/lint_and_type_check.sh

@@ -70,7 +70,6 @@ uv run -m cleanpy .
 uv run -m ruff clean
 # uv run -m ruff format .
 uv run -m ruff check . --fix
-uv run --no-dev --project $HOME/code/machineconfig -m machineconfig.scripts.python.ai.generate_files
 
 mkdir .ai/linters
 

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/ai/solutions/generic.py

@@ -46,6 +46,7 @@ def adjust_gitignore(repo_root: Path) -> None:
         ".ai",
         "GEMINI.md",
         "CLAUDE.md",
+        "CRUSH.md",
         ".cursor",
         ".github/instructions",
         ".github/chatmodes",

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/croshell.py

@@ -46,6 +46,7 @@ console = Console()
 p = PathExtended(r'{path}').absolute()
 try:
     from machineconfig.utils.files.read import Read
+    from machineconfig.utils.accessories import pprint
     dat = Read.read(p)
     if isinstance(dat, dict):
         panel_title = f"📄 File Data: {{p.name}}"
@@ -64,12 +65,12 @@ except Exception as e:
 def main(
     python: Annotated[bool, typer.Option("--python", "-p", help="flag to use python over IPython.")] = False,
     fzf: Annotated[bool, typer.Option("--fzf", "-F", help="search with fuzzy finder for python scripts and run them")] = False,
-    ve: Annotated[Optional[str], typer.Option("--ve", "-v", help="virtual enviroment to use, defaults to activated ve, if existed, else ve.")] = None,
     profile: Annotated[Optional[str], typer.Option("--profile", "-P", help="ipython profile to use, defaults to default profile.")] = None,
     read: Annotated[str, typer.Option("--read", "-r", help="read a binary file.")] = "",
     jupyter: Annotated[bool, typer.Option("--jupyter", "-j", help="run in jupyter interactive console")] = False,
     streamlit_viewer: Annotated[bool, typer.Option("--stViewer", "-s", help="view in streamlit app")] = False,
     visidata: Annotated[bool, typer.Option("--visidata", "-V", help="open data file in visidata")] = False,
+    local: Annotated[bool, typer.Option("--local", "-l", help="run in local mode, not in virtual env.")]= False,
 ) -> None:
     # ==================================================================================
     # flags processing
@@ -141,7 +142,16 @@ from pathlib import Path
     else:
         if interpreter == "ipython": profile = f" --profile {ipython_profile} --no-banner"
         else: profile = ""
-        fire_line = f"uv run --python 3.13 --with machineconfig[plot] {interpreter} {interactivity} {profile} {str(pyfile)}"
+        if local:
+            from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+            repo_root = LIBRARY_ROOT.parent.parent
+            if repo_root.parent.name == "code" and repo_root.name == "machineconfig" and repo_root.exists() and repo_root.is_dir():
+                ve_line = f"--project {str(repo_root)}"
+            else:
+                console.print(Panel("❌ Could not determine the local machineconfig repo root. Please ensure the `REPO_ROOT` in `source_of_truth.py` is correctly set to the local path of the machineconfig repo, or do not use the `--local` flag.", title="Error", border_style="red"))
+                return
+        else: ve_line = "--with machineconfig[plot]"
+        fire_line = f"uv run --python 3.13 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script
     run_shell_script(fire_line, clean_env=False)

{machineconfig-5.37 → machineconfig-5.39}/src/machineconfig/scripts/python/croshell_helpers/start_slidev.py

@@ -2,7 +2,7 @@
 slidev
 """
 
-from machineconfig.utils.source_of_truth import CONFIG_PATH
+from machineconfig.utils.source_of_truth import CONFIG_ROOT
 from machineconfig.utils.code import print_code
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.terminal import Response
@@ -13,7 +13,7 @@ import platform
 
 PORT_DEFAULT = 3030
 
-SLIDEV_REPO = PathExtended(CONFIG_PATH).joinpath(".cache/slidev")
+SLIDEV_REPO = PathExtended(CONFIG_ROOT).joinpath(".cache/slidev")
 if not SLIDEV_REPO.joinpath("components").exists():
     print("📦 Initializing Slidev repository...")
     subprocess.run(f"cd {SLIDEV_REPO.parent};npm init slidev@latest", check=False, shell=True, text=True)