machineconfig 7.2__tar.gz → 7.33__tar.gz

{machineconfig-7.2/src/machineconfig.egg-info → machineconfig-7.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 7.2
+Version: 7.33
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-7.2 → machineconfig-7.33}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "7.2"
+version = "7.33"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -69,8 +69,8 @@ sessions = "machineconfig.scripts.python.sessions:main"
 croshell = "machineconfig.scripts.python.croshell:main"
 ftpx = "machineconfig.scripts.python.ftpx:main"
 utils = "machineconfig.scripts.python.utils:main"
-mcfg = "machineconfig.scripts.python.mcfg:main"
-machineconfig = "machineconfig.scripts.python.mcfg:main"
+mcfg = "machineconfig.scripts.python.machineconfig:main"
+machineconfig = "machineconfig.scripts.python.machineconfig:main"
 terminal = "machineconfig.scripts.python.terminal:main"
 define = "machineconfig.scripts.python.define:main"
 

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/profile/create_links.py

@@ -79,7 +79,7 @@ def read_mapper() -> MapperFileData:
 
 
 def apply_mapper(mapper_data: dict[str, list[ConfigMapper]],
-                 on_conflict: Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"],
+                 on_conflict: Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"],
                  method: Literal["symlink", "copy"]
                  ):
     operation_records: list[OperationRecord] = []

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/profile/create_links_export.py

@@ -4,7 +4,7 @@ from typing import Optional, Literal, Annotated
 
 
 def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for setting up the config file.")],
-                            on_conflict: Annotated[Literal["throw-error", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")],
+                            on_conflict: Annotated[Literal["throw-error", "overwrite-default-path", "backup-default-path"], typer.Option(..., help="Action to take on conflict")],
                             which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
                             interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
     """Terminology:
@@ -32,7 +32,7 @@ def main_public_from_parser(method: Annotated[Literal["symlink", "copy"], typer.
 
 
 def main_private_from_parser(method: Annotated[Literal["symlink", "copy"], typer.Option(..., help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., help="Action to take on conflict")] = "throw-error",
+                             on_conflict: Annotated[Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"], typer.Option(..., help="Action to take on conflict")] = "throw-error",
                              which: Annotated[Optional[str], typer.Option(..., help="Specific items to process")] = None,
                              interactive: Annotated[bool, typer.Option(..., help="Run in interactive mode")] = False):
     from machineconfig.profile.create_links import ConfigMapper, read_mapper

machineconfig-7.2/src/machineconfig/scripts/linux/mcfgs → machineconfig-7.33/src/machineconfig/scripts/linux/wrap_mcfg

@@ -27,18 +27,18 @@ wrap_in_shell_script() {
   "$command" "$@"
 
   if [[ -f "$OP_PROGRAM_PATH" ]]; then
-    printf "%b\n" "${GREEN}✅ Found op program:${RESET} ${OP_PROGRAM_PATH}"
+    printf "%b\n" "${GREEN}🚀 Taking over from python script @ ${OP_PROGRAM_PATH}${RESET}"
     bat --style=plain --paging=never "$OP_PROGRAM_PATH"
     printf "%b\n" "${GREEN}▶ Running...${RESET}"
     . "$OP_PROGRAM_PATH"
     status=$?
     if [[ $status -eq 0 ]]; then
-      printf "%b\n" "${GREEN}✅ Completed successfully (exit ${status})${RESET}"
+      printf "%b\n" "${GREEN}✅ '${command}' execution completed.${RESET}"
     else
       printf "%b\n" "${YELLOW}⚠️  Program exited with status ${status}${RESET}"
     fi
   else
-    printf "%b\n" "${YELLOW}⚠️  No op program found at: ${OP_PROGRAM_PATH}${RESET}"
+    printf "%b\n" "${GREEN}✅ '${command}' execution completed.${RESET}"
   fi
 }
 

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/define.py

@@ -16,10 +16,10 @@ def define_scripts():
     print(script)
 
 
-def main():
+def get_app():
     app = typer.Typer(add_completion=False, no_args_is_help=True)
     app.command(name="scripts", help="define all scripts", no_args_is_help=False)(define_scripts)
-    app()
+    return app
 
 
 # if __name__ == "__main__":

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=6.99",
+#     "machineconfig>=7.33",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -7,21 +7,23 @@ import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile
 
 
 def private(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")],
-                             on_conflict: Annotated[Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+                             on_conflict: Annotated[Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
                              which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = None,
                              interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Run in interactive mode")] = False):
     """🔗 Manage private configuration files."""
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_private_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
+
 def public(method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for setting up the config file.")],
-                            on_conflict: Annotated[Literal["throw-error", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+                            on_conflict: Annotated[Literal["throw-error", "overwrite-default-path", "backup-default-path"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
                             which: Annotated[Optional[str], typer.Option(..., "--which", "-w", help="Specific items to process")] = None,
                             interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Run in interactive mode")] = False):
     """🔗 Manage public configuration files."""
     import machineconfig.profile.create_links_export as create_links_export
     create_links_export.main_public_from_parser(method=method, on_conflict=on_conflict, which=which, interactive=interactive)
 
+
 def shell():
     """🔗 Configure your shell profile."""
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
@@ -37,7 +39,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.99")
+        uv_with.append("machineconfig>=7.33")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])
@@ -50,6 +52,7 @@ def pwsh_theme():
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])
 
+
 def starship_theme():
     """🔗 Select starship prompt theme."""
     import subprocess
@@ -78,6 +81,7 @@ def starship_theme():
     except ValueError:
         typer.echo("❌ Please enter a valid number")
 
+
 def copy_assets(which: Annotated[Literal["scripts", "settings", "both"], typer.Argument(..., help="Which assets to copy")]):
     """🔗 Copy asset files from library to machine."""
     import machineconfig.profile.create_helper as create_helper

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/helpers_devops/cli_config_dotfile.py

@@ -1,3 +1,4 @@
+
 """Like yadm and dotter."""
 
 from typing import Annotated, Literal
@@ -7,10 +8,9 @@ import typer
 def main(
     file: Annotated[str, typer.Argument(help="file/folder path.")],
     method: Annotated[Literal["symlink", "copy"], typer.Option(..., "--method", "-m", help="Method to use for linking files")] = "copy",
-    on_conflict: Annotated[Literal["throw-error", "overwriteSelfManaged", "backupSelfManaged", "overwriteDefaultPath", "backupDefaultPath"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
+    on_conflict: Annotated[Literal["throw-error", "overwrite-self-managed", "backup-self-managed", "overwrite-default-path", "backup-default-path"], typer.Option(..., "--on-conflict", "-o", help="Action to take on conflict")] = "throw-error",
     sensitivity: Annotated[Literal["private", "public"], typer.Option(..., "--sensitivity", "-s", help="Sensitivity of the config file.")] = "private",
-    destination: Annotated[str, typer.Option("--destination", "-d", help="destination folder (override the default, use at your own risk)")] = "",
-) -> None:
+    destination: Annotated[str, typer.Option("--destination", "-d", help="destination folder (override the default, use at your own risk)")] = "",) -> None:
     from rich.console import Console
     from rich.panel import Panel
     from machineconfig.utils.links import symlink_map, copy_map
@@ -33,25 +33,23 @@ def main(
         new_path = dest_path.joinpath(orig_path.name)
 
     from machineconfig.utils.path_extended import PathExtended
-    if method == "copy":
-        copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
-    elif method == "symlink":
-        symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
-    else:
-        raise ValueError(f"Unknown method: {method}")
-    console.print(
-        Panel(
-            "\n".join(
-                [
-                    "✅ Symbolic link created successfully!",
-                    "🔄 Add the following snippet to mapper.toml to persist this mapping:",
-                ]
-            ),
-            title="Symlink Created",
-            border_style="green",
-            padding=(1, 2),
-        )
-    )
+    match method:
+        case "copy":
+            try:
+                copy_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+            except Exception as e:
+                typer.echo(f"[red]Error:[/] {e}")
+                typer.Exit(code=1)
+                return
+        case "symlink":
+            try:
+                symlink_map(config_file_default_path=PathExtended(orig_path), self_managed_config_file_path=PathExtended(new_path), on_conflict=on_conflict)
+            except Exception as e:
+                typer.echo(f"[red]Error:[/] {e}")
+                typer.Exit(code=1)
+        case _:
+            raise ValueError(f"Unknown method: {method}")
+    console.print(Panel("\n".join(["✅ Symbolic link created successfully!", "🔄 Add the following snippet to mapper.toml to persist this mapping:",]), title="Symlink Created", border_style="green", padding=(1, 2),))
 
     # mapper_snippet = "\n".join(
     #     [
@@ -61,7 +59,6 @@ def main(
     #         f"{orig_path.name.split('.')[0]} = {{ this = '{orig_path.collapseuser().as_posix()}', to_this = '{new_path.collapseuser().as_posix()}' }}",
     #     ]
     # )
-
     # console.print(
     #     Panel(
     #         mapper_snippet,

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -48,9 +48,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.99" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=7.33" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.99" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=7.33" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -75,7 +75,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=6.99,textual" """
+    else: executable = """--with "machineconfig>=7.33,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/helpers_devops/cli_share_server.py

@@ -140,7 +140,8 @@ croc {relay_arg} send {zip_arg} {qrcode_arg} {text_arg} {path_arg}"""
     exit_then_run_shell_script(script=script, strict=False)
 
 
-def share_file_receive(code_args: Annotated[list[str], typer.Argument(help="Receive code or relay command. Examples: '7121-donor-olympic-bicycle' or '--relay 10.17.62.206:443 7121-donor-olympic-bicycle'")],) -> None:
+def share_file_receive(code_args: Annotated[list[str], typer.Argument(help="Receive code or relay command. Examples: '7121-donor-olympic-bicycle' or '--relay 10.17.62.206:443 7121-donor-olympic-bicycle'")],
+) -> None:
     """Receive a file using croc with relay server.
 Usage examples:
     devops network receive 7121-donor-olympic-bicycle
@@ -150,9 +151,22 @@ Usage examples:
     from machineconfig.utils.installer_utils.installer import install_if_missing
     install_if_missing(which="croc")
     import platform
+    import sys
     
     is_windows = platform.system() == "Windows"
     
+    # If no args passed via typer, try to get them from sys.argv directly
+    # This handles the case where -- was used and arguments weren't parsed by typer
+    if not code_args or (len(code_args) == 1 and code_args[0] in ['--relay', 'croc']):
+        # Find the index of 'rx' or 'receive' in sys.argv and get everything after it
+        try:
+            for i, arg in enumerate(sys.argv):
+                if arg in ['rx', 'receive', 'r'] and i + 1 < len(sys.argv):
+                    code_args = sys.argv[i + 1:]
+                    break
+        except Exception:
+            pass
+    
     # Join all arguments
     input_str = " ".join(code_args)
     tokens = input_str.split()
@@ -161,25 +175,30 @@ Usage examples:
     relay_server: str | None = None
     secret_code: str | None = None
     
-    # Remove 'croc' from tokens if present
-    tokens = [t for t in tokens if t != 'croc']
+    # Remove 'croc' and 'export' from tokens if present
+    tokens = [t for t in tokens if t not in ['croc', 'export']]
     
     # Look for --relay flag and capture next token
-    if '--relay' in tokens:
-        relay_idx = tokens.index('--relay')
-        if relay_idx + 1 < len(tokens):
-            relay_server = tokens[relay_idx + 1]
+    relay_idx = -1
+    for i, token in enumerate(tokens):
+        if token == '--relay' and i + 1 < len(tokens):
+            relay_server = tokens[i + 1]
+            relay_idx = i
+            break
     
     # Look for CROC_SECRET= prefix in any token
     for token in tokens:
         if token.startswith('CROC_SECRET='):
-            secret_code = token.split('=', 1)[1].strip('"')
+            secret_code = token.split('=', 1)[1].strip('"').strip("'")
             break
     
     # If no secret code found yet, look for tokens with dashes (typical pattern: number-word-word-word)
+    # Skip relay server and relay flag
     if not secret_code:
-        for token in tokens:
-            if '-' in token and not token.startswith('-') and token not in [relay_server, 'export']:
+        for i, token in enumerate(tokens):
+            if '-' in token and not token.startswith('-') and token != relay_server:
+                if relay_idx >= 0 and (i == relay_idx or i == relay_idx + 1):
+                    continue  # Skip relay server parts
                 secret_code = token
                 break
     

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.99"]
+        uv_with = ["machineconfig>=7.33"]
         uv_project_dir = None
 
     import tempfile

machineconfig-7.2/src/machineconfig/scripts/python/mcfg.py → machineconfig-7.33/src/machineconfig/scripts/python/machineconfig.py

@@ -8,6 +8,7 @@ from machineconfig.scripts.python.utils import get_app as get_utils_app
 from machineconfig.scripts.python.ftpx import ftpx as ftpx_func
 from machineconfig.scripts.python.croshell import croshell as croshell_func
 from machineconfig.scripts.python.fire_jobs import fire as get_fire_jobs_app
+from machineconfig.scripts.python.define import get_app as get_define_app
 
 def get_app():
     import typer
@@ -40,6 +41,9 @@ def get_app():
     app.add_typer(utils_app, name="utils", help="[u] Utility commands", no_args_is_help=True)
     app.add_typer(utils_app, name="u", hidden=True)  # short alias
 
+    define_app = get_define_app()
+    app.add_typer(define_app, name="define", help="[df] Define and manage configurations", no_args_is_help=True)
+    app.add_typer(define_app, name="df", hidden=True)  # short alias
     return app
 
 

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=6.92" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=7.32" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.99" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=7.33" 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-7.2/src/machineconfig/scripts/windows/mcfgs.ps1 → machineconfig-7.33/src/machineconfig/scripts/windows/wrap_mcfg.ps1

@@ -30,10 +30,11 @@ function wrap_in_shell_script {
 
     # Check if the file exists
     if (Test-Path $env:OP_PROGRAM_PATH) {
-        Write-Host "Found op program at: $env:OP_PROGRAM_PATH"
+        Write-Host "🚀 Taking over from python script @ $env:OP_PROGRAM_PATH"
         & $env:OP_PROGRAM_PATH
+        Write-Host "✅ '$Command' execution completed."
     } else {
-        Write-Host "no op program found"
+        Write-Host "✅ '$Command' execution completed."
     }
 
     # Clean up the temporary environment variable so it doesn't leak to other processes/sessions

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/settings/shells/bash/init.sh

@@ -37,7 +37,7 @@ add_to_path_if_not_already \
 . $CONFIG_ROOT/settings/broot/br.sh
 . $CONFIG_ROOT/settings/lf/linux/exe/lfcd.sh
 . $CONFIG_ROOT/settings/tere/terecd.sh
-. $CONFIG_ROOT/scripts/linux/mcfgs
+. $CONFIG_ROOT/scripts/linux/wrap_mcfg
 
 # check if file in ~/dotfiles/machineconfig/init_linux.sh exists and source it
 if [ -f "$HOME/dotfiles/machineconfig/init_linux.sh" ]; then
@@ -54,7 +54,7 @@ alias ff='wrap_in_shell_script ftpx'
 alias f='wrap_in_shell_script fire'
 alias r='wrap_in_shell_script croshell'
 alias u='wrap_in_shell_script utils'
-alias t='wrap_in_shell_script term'
+alias t='wrap_in_shell_script terminal'
 
 
 # alias gcs='gh copilot suggest -t shell'

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -24,11 +24,11 @@ Add-ToPathIfNotAlready -Directories @(
 )
 
 # sources  ================================================================
-if (Test-Path "$CONFIG_ROOT\scripts\windows\mcfgs.ps1") {
+if (Test-Path "$CONFIG_ROOT\scripts\windows\wrap_mcfg.ps1") {
     . $CONFIG_ROOT\settings\broot\brootcd.ps1
     . $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
     . $CONFIG_ROOT\settings\tere\terecd.ps1
-    . $CONFIG_ROOT\scripts\windows\mcfgs.ps1
+    . $CONFIG_ROOT\scripts\windows\wrap_mcfg.ps1
 
     function lsdla { lsd -la }
     Set-Alias -Name l -Value lsdla -Option AllScope

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,16 +1,16 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
-. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/mcfgs")
+. <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/linux/wrap_mcfg")
 
-alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=6.99" terminal'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.33" terminal'
 
 alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'

{machineconfig-7.2 → machineconfig-7.33}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -1,17 +1,17 @@
 
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
-iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/windows/mcfgs.ps1").Content
+iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/scripts/windows/wrap_mcfg.ps1").Content
 
-function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=6.99" terminal $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.33" terminal $args }
 
 function d { wrap_in_shell_script devops @args }
 function c { wrap_in_shell_script cloud @args }

machineconfig-7.33/src/machineconfig/utils/io.py

@@ -0,0 +1,148 @@
+from __future__ import annotations
+
+from typing import Any, Union, Optional, Mapping
+from pathlib import Path
+import json
+import pickle
+import configparser
+
+
+PathLike = Union[str, Path]
+
+
+def _ensure_parent(path: PathLike) -> Path:
+    path_obj = Path(path)
+    path_obj.parent.mkdir(parents=True, exist_ok=True)
+    return path_obj
+
+
+def save_pickle(obj: Any, path: PathLike, verbose: bool = False) -> Path:
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "wb") as fh:
+        pickle.dump(obj, fh, protocol=pickle.HIGHEST_PROTOCOL)
+    if verbose:
+        print(f"Saved pickle -> {path_obj}")
+    return Path(path_obj)
+
+
+def save_json(obj: Any, path: PathLike, indent: Optional[int] = None, verbose: bool = False) -> Path:
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "w", encoding="utf-8") as fh:
+        json.dump(obj, fh, indent=indent, ensure_ascii=False)
+        fh.write("\n")
+    if verbose:
+        print(f"Saved json -> {path_obj}")
+    return Path(path_obj)
+
+
+def save_ini(path: PathLike, obj: Mapping[str, Mapping[str, Any]], verbose: bool = False) -> Path:
+    cp = configparser.ConfigParser()
+    for section, values in obj.items():
+        cp[section] = {str(k): str(v) for k, v in values.items()}
+    path_obj = _ensure_parent(path)
+    with open(path_obj, "w", encoding="utf-8") as fh:
+        cp.write(fh)
+    if verbose:
+        print(f"Saved ini -> {path_obj}")
+    return Path(path_obj)
+
+
+def read_ini(path: "Path", encoding: Optional[str] = None):
+    if not Path(path).exists() or Path(path).is_dir():
+        raise FileNotFoundError(f"File not found or is a directory: {path}")
+    import configparser
+    res = configparser.ConfigParser()
+    res.read(filenames=[str(path)], encoding=encoding)
+    return res
+
+
+def read_json(path: "Path", r: bool = False, **kwargs: Any) -> Any:  # return could be list or dict etc
+    import json
+    try:
+        mydict = json.loads(Path(path).read_text(encoding="utf-8"), **kwargs)
+    except Exception:
+        import re
+        def remove_comments(text: str) -> str:
+            # remove all // single-line comments
+            text = re.sub(r'//.*', '', text)
+            # remove all /* … */ block comments (non-greedy)
+            text = re.sub(r'/\*.*?\*/', '', text, flags=re.DOTALL)
+            return text
+        mydict = json.loads(remove_comments(Path(path).read_text(encoding="utf-8")), **kwargs)
+    _ = r
+    return mydict
+
+
+def from_pickle(path: Path) -> Any:
+    import pickle
+
+    return pickle.loads(path.read_bytes())
+
+
+def pwd2key(password: str, salt: Optional[bytes] = None, iterations: int = 10) -> bytes:  # Derive a secret key from a given password and salt"""
+    import base64
+    if salt is None:
+        import hashlib
+        m = hashlib.sha256()
+        m.update(password.encode(encoding="utf-8"))
+        return base64.urlsafe_b64encode(s=m.digest())  # make url-safe bytes required by Ferent.
+    from cryptography.hazmat.primitives import hashes
+    from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
+    return base64.urlsafe_b64encode(PBKDF2HMAC(algorithm=hashes.SHA256(), length=32, salt=salt, iterations=iterations, backend=None).derive(password.encode()))
+
+
+def encrypt(msg: bytes, key: Optional[bytes] = None, pwd: Optional[str] = None, salted: bool = True, iteration: Optional[int] = None, gen_key: bool = False) -> bytes:
+    import base64
+    from cryptography.fernet import Fernet
+
+    salt, iteration = None, None
+    if pwd is not None:  # generate it from password
+        assert (key is None) and (type(pwd) is str), "❌ You can either pass key or pwd, or none of them, but not both."
+        import secrets
+        iteration = iteration or secrets.randbelow(exclusive_upper_bound=1_000_000)
+        salt = secrets.token_bytes(nbytes=16) if salted else None
+        key_resolved = pwd2key(password=pwd, salt=salt, iterations=iteration)
+    elif key is None:
+        if gen_key:
+            key_resolved = Fernet.generate_key()
+            Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").write_bytes(key_resolved)
+        else:
+            try:
+                key_resolved = Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").read_bytes()
+                print(f"⚠️ Using key from: {Path.home().joinpath('dotfiles/creds/data/encrypted_files_key.bytes')}")
+            except FileNotFoundError as err:
+                print("\n" * 3, "~" * 50, """Consider Loading up your dotfiles or pass `gen_key=True` to make and save one.""", "~" * 50, "\n" * 3)
+                raise FileNotFoundError(err) from err
+    elif isinstance(key, (str, Path)):
+        key_resolved = Path(key).read_bytes()  # a path to a key file was passed, read it:
+    elif type(key) is bytes:
+        key_resolved = key  # key passed explicitly
+    else:
+        raise TypeError("❌ Key must be either a path, bytes object or None.")
+    code = Fernet(key=key_resolved).encrypt(msg)
+    if pwd is not None and salt is not None and iteration is not None:
+        return base64.urlsafe_b64encode(b"%b%b%b" % (salt, iteration.to_bytes(4, "big"), base64.urlsafe_b64decode(code)))
+    return code
+
+
+def decrypt(token: bytes, key: Optional[bytes] = None, pwd: Optional[str] = None, salted: bool = True) -> bytes:
+    import base64
+    if pwd is not None:
+        assert key is None, "❌ You can either pass key or pwd, or none of them, but not both."
+        if salted:
+            decoded = base64.urlsafe_b64decode(token)
+            salt, iterations, token = decoded[:16], decoded[16:20], base64.urlsafe_b64encode(decoded[20:])
+            key_resolved = pwd2key(password=pwd, salt=salt, iterations=int.from_bytes(bytes=iterations, byteorder="big"))
+        else:
+            key_resolved = pwd2key(password=pwd)  # trailing `;` prevents IPython from caching the result.
+    elif type(key) is bytes:
+        assert pwd is None, "❌ You can either pass key or pwd, or none of them, but not both."
+        key_resolved = key  # passsed explicitly
+    elif key is None:
+        key_resolved = Path.home().joinpath("dotfiles/creds/data/encrypted_files_key.bytes").read_bytes()  # read from file
+    elif isinstance(key, (str, Path)):
+        key_resolved = Path(key).read_bytes()  # passed a path to a file containing kwy
+    else:
+        raise TypeError(f"❌ Key must be either str, P, Path, bytes or None. Recieved: {type(key)}")
+    from cryptography.fernet import Fernet
+    return Fernet(key=key_resolved).decrypt(token)