machineconfig 6.87__tar.gz → 6.88__tar.gz

{machineconfig-6.87/src/machineconfig.egg-info → machineconfig-6.88}/PKG-INFO

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

{machineconfig-6.87 → machineconfig-6.88}/pyproject.toml

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

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/jobs/installer/installer_data.json

@@ -208,7 +208,7 @@
     {
       "appName": "croc",
       "repoURL": "https://github.com/schollz/croc",
-      "doc": "🦎 Easily and securely send things from one computer to another",
+      "doc": "🦎 Easily and securely send and share things from one computer to another",
       "fileNamePattern": {
         "amd64": {
           "linux": "croc_{version}_Linux-64bit.tar.gz",
@@ -273,6 +273,23 @@
         }
       }
     },
+    {
+      "appName": "asciinema",
+      "repoURL": "https://github.com/asciinema/asciinema",
+      "doc": "🎥 Terminal session recorder",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "asciinema-x86_64-unknown-linux-gnu",
+          "windows": null,
+          "macos": "asciinema-x86_64-apple-darwin"
+        },
+        "arm64": {
+          "linux": null,
+          "windows": null,
+          "macos": null
+        }
+      }
+    },
     {
       "appName": "lolcatjs",
       "repoURL": "CMD",

machineconfig-6.88/src/machineconfig/scripts/linux/mcfgs

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+
+wrap_in_op_program() {
+  # set -euo pipefail
+
+  # ANSI color/style codes
+  BOLD="\033[1m"
+  RESET="\033[0m"
+  GREEN="\033[32m"
+  YELLOW="\033[33m"
+  BLUE="\033[34m"
+  RED="\033[31m"
+
+  local command="$1"
+  shift  
+  local RANDOM_NAME=$(date +%s%N | sha256sum | head -c 16)
+  local OP_DIR="$HOME/tmp_results/tmp_scripts/machineconfig"
+  local OP_PROGRAM_PATH="$OP_DIR/${RANDOM_NAME}.sh"
+  export OP_PROGRAM_PATH
+  local timestamp=$(date -u +"%Y-%m-%d %H:%M:%SZ")
+  printf "%b\n" "${BOLD}${BLUE}🛠️  machineconfig — running ${command}${RESET}"
+  printf "%b\n" "${BLUE}Timestamp:${RESET} ${timestamp}"
+  printf "%b\n" "${BLUE}Op program path:${RESET} ${OP_PROGRAM_PATH}"
+
+  # Forward arguments to the command
+  "$command" "$@"
+
+  if [[ -f "$OP_PROGRAM_PATH" ]]; then
+    printf "%b\n" "${GREEN}✅ Found op program:${RESET} ${OP_PROGRAM_PATH}"
+    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}"
+    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}"
+  fi
+}
+
+if [[ $# -gt 0 ]]; then
+  wrap_in_op_program "$@"
+fi
+

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/scripts/python/fire_jobs.py

@@ -35,7 +35,6 @@ def route(args: FireJobArgs, fire_args: str = "") -> None:
     else:
         choice_file = path_obj
 
-
     repo_root = get_repo_root(Path(choice_file))
     print(f"💾 Selected file: {choice_file}.\nRepo root: {repo_root}")
     if args.marimo:

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.87")
+        uv_with.append("machineconfig>=6.88")
     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])

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -3,35 +3,42 @@ import typer
 from typing import Optional, Annotated
 
 
+def copy_both_assets():
+    import machineconfig.profile.create_helper as create_helper
+    create_helper.copy_assets_to_machine(which="scripts")
+    create_helper.copy_assets_to_machine(which="settings")
+
+
 def update(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-na", help="Copy (overwrite) assets to the machine after the update")] = False):
     """🔄 UPDATE uv and machineconfig"""
     # from machineconfig.utils.source_of_truth import LIBRARY_ROOT
     # repo_root = LIBRARY_ROOT.parent.parent
     from pathlib import Path
     if Path.home().joinpath("code", "machineconfig").exists():
-        code = """
+        shell_script = """
 uv self update
 cd ~/code/machineconfig
 git pull
 uv tool install --upgrade --editable $HOME/code/machineconfig
     """
     else:
-        code = """
+        shell_script = """
 uv self update
 uv tool install --upgrade machineconfig
     """
     import platform
     if platform.system() == "Windows":
-        # from machineconfig.utils.code import run_shell_script_after_exit
-        # run_shell_script_after_exit(code)
-        print(f'please run {code} in powershell to update machineconfig')
+        from machineconfig.utils.code import exit_then_run_shell_script, get_uv_command_executing_python_script
+        from machineconfig.utils.meta import lambda_to_python_script
+        python_script = lambda_to_python_script(lambda: copy_both_assets(), in_global=True, import_module=False)
+        uv_command, _py_file = get_uv_command_executing_python_script(python_script=python_script, uv_with=["machineconfig"], uv_project_dir=None)
+        exit_then_run_shell_script(shell_script + "\n" + uv_command, strict=True)
     else:
         from machineconfig.utils.code import run_shell_script
-        run_shell_script(code)
+        run_shell_script(shell_script)
     if not no_copy_assets:
-        import machineconfig.profile.create_helper as create_helper
-        create_helper.copy_assets_to_machine(which="scripts")
-        create_helper.copy_assets_to_machine(which="settings")
+        copy_both_assets()
+
 def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-na", help="Copy (overwrite) assets to the machine after the update")] = False):
     """📋 CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates."""
     from machineconfig.utils.code import run_shell_script
@@ -41,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.87" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.88" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.87" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.88" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -68,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.87,textual" """
+    else: executable = """--with "machineconfig>=6.88,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.87 → machineconfig-6.88}/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.87"]
+        uv_with = ["machineconfig>=6.88"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.87 → machineconfig-6.88}/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.87" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.88" 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-6.88/src/machineconfig/scripts/windows/mcfgs.ps1

@@ -0,0 +1,54 @@
+function warp_in_op_code {
+    param(
+        [Parameter(Mandatory=$true)]
+        [string]$Command,
+        
+        [Parameter(ValueFromRemainingArguments=$true)]
+        [string[]]$Arguments
+    )
+    
+    # Generate a random name (based on current timestamp hashed with SHA256)
+    # Compute SHA256 of the timestamp string (don't pipe the string to Get-FileHash
+    # because that attempts to treat the input as a path). Take the first 16 hex
+    # chars as the random name.
+    $ts = Get-Date -Format o
+    try {
+        $sha = [System.Security.Cryptography.SHA256]::Create()
+        $bytes = [System.Text.Encoding]::UTF8.GetBytes($ts)
+        $hashBytes = $sha.ComputeHash($bytes)
+        $hash = [System.BitConverter]::ToString($hashBytes).Replace("-", "").ToLower()
+        $randomName = $hash.Substring(0, 16)
+    } finally {
+        if ($sha) { $sha.Dispose() }
+    }
+
+    # Define the output path
+    $env:OP_PROGRAM_PATH = "$HOME/tmp_results/tmp_scripts/machineconfig/${randomName}.ps1"
+
+    # Run the specified command with its arguments
+    & $Command @Arguments
+
+    # Check if the file exists
+    if (Test-Path $env:OP_PROGRAM_PATH) {
+        Write-Host "Found op program at: $env:OP_PROGRAM_PATH"
+        & $env:OP_PROGRAM_PATH
+    } else {
+        Write-Host "no op program found"
+    }
+
+    # Clean up the temporary environment variable so it doesn't leak to other processes/sessions
+    try {
+        Remove-Item Env:\OP_PROGRAM_PATH -ErrorAction SilentlyContinue
+    } catch {
+        # best-effort cleanup; ignore any errors
+    }
+
+    # Also explicitly clear the variable in the current process
+    $env:OP_PROGRAM_PATH = $null
+}
+
+# Call the function with any arguments passed to the script
+if ($args.Count -gt 0) {
+    warp_in_op_code @args
+}
+

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.87" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.88" 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-6.87 → machineconfig-6.88}/src/machineconfig/settings/lf/windows/lfrc

@@ -51,19 +51,19 @@ map x
 map c
 map v
 map r
-map D $diskonaut $env:f
-map K $kondo $env:f
+map D $diskonaut $f
+map K $kondo $f
 map r reload
 
 
 # e edit
 map e  # edit modal key.
-map en $nano $env:f
-map el $pwsh -File $env:USERPROFILE/.local/bin/lvim.ps1 -- $env:f
-map ev $nvim $env:f
-map ec $code $env:f
+map en $nano $f
+map el $pwsh -File $env:USERPROFILE/.local/bin/lvim.ps1 -- $f
+map ev $nvim $f
+map ec $code $f
 map ep $& 'C:\Program Files (x86)\JetBrains\PyCharm Community Edition 2022.2\bin\pycharm.exe' $f
-map o  $start $env:f
+map o  $start $f
 map <enter> open
 
 
@@ -73,27 +73,25 @@ map ww $powershell
 map wp $pwsh
 map wc $croshell.ps1
 map wm $cmd
-map i $~/.config/machineconfig/settings/lf/windows/previewer.ps1 $env:f
-map R $powershell $env:USERPROFILE/scripts/croshell.ps1 -r $env:f
+map i $~/.config/machineconfig/settings/lf/windows/previewer.ps1 $f
+map R $powershell $env:USERPROFILE/scripts/croshell.ps1 -r $f
 
 # o file/folder Operations
 map o
 map od cut
 map op paste
 map oy copy
-map oc $Set-Clipboard -Value $env:f
+map oc $Set-Clipboard -Value $f
 map c clear
 map or rename
-map <delete> :{{
-	delete
-	echo 'FINISHED DELETEING'
-}}
+map <delete> delete
+map <del> delete
 map of reload
 map os mark-save
 map ol mark-load
 map oR mark-remove
-map oD !ouch d $env:f
-map oC !ouch c $env:f '$env:f'.zip
+map oD !ouch d $f
+map oC !ouch c $f '$f'.zip
 
 # j jump
 map j

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/settings/shells/bash/init.sh

@@ -37,23 +37,24 @@ 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
+
 # check if file in ~/dotfiles/machineconfig/init_linux.sh exists and source it
 if [ -f "$HOME/dotfiles/machineconfig/init_linux.sh" ]; then
     # echo "Sourcing $HOME/dotfiles/machineconfig/init_linux.sh"
     source "$HOME/dotfiles/machineconfig/init_linux.sh"
 fi
 
-# set alias l to lsd -la
 alias l='lsd -la'
-alias d=devops
-alias c=cloud
-alias a=agents
-alias s=sessions
-alias ff=ftpx
-alias f=fire
-alias r=croshell
-alias u=utils
-alias t=term
+alias d='wrap_in_op_program devops'
+alias c='wrap_in_op_program cloud'
+alias a='wrap_in_op_program agents'
+alias s='wrap_in_op_program sessions'
+alias ff='wrap_in_op_program ftpx'
+alias f='wrap_in_op_program fire'
+alias r='wrap_in_op_program croshell'
+alias u='wrap_in_op_program utils'
+alias t='wrap_in_op_program term'
 
 
 # alias gcs='gh copilot suggest -t shell'

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/settings/shells/pwsh/init.ps1

@@ -24,22 +24,44 @@ Add-ToPathIfNotAlready -Directories @(
 )
 
 # sources  ================================================================
-. $CONFIG_ROOT\settings\broot\brootcd.ps1
-. $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
-. $CONFIG_ROOT\settings\tere\terecd.ps1
-
-
-function lsdla { lsd -la }
-Set-Alias -Name l -Value lsdla -Option AllScope
-function d { devops @args }
-function c { cloud @args }
-function a { agents @args }
-function ss { sessions @args }
-function ff { ftpx @args }
-function f { fire @args }
-function rr { croshell @args }
-function u { utils @args }
-function t { terminal @args }
+if (Test-Path "$CONFIG_ROOT\scripts\windows\mcfgs.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
+
+    function lsdla { lsd -la }
+    Set-Alias -Name l -Value lsdla -Option AllScope
+    function d { warp_in_op_code devops @args }
+    function c { warp_in_op_code cloud @args }
+    function a { warp_in_op_code agents @args }
+    function ss { warp_in_op_code sessions @args }
+    function ff { warp_in_op_code ftpx @args }
+    function f { warp_in_op_code fire @args }
+    function rr { warp_in_op_code croshell @args }
+    function u { warp_in_op_code utils @args }
+    function t { warp_in_op_code terminal @args }
+
+}
+else {
+    Write-Host "Missing config files: $CONFIG_ROOT"
+    function lsdla { lsd -la }
+    Set-Alias -Name l -Value lsdla -Option AllScope
+    function d { devops @args }
+    function c { cloud @args }
+    function a { agents @args }
+    function ss { sessions @args }
+    function ff { ftpx @args }
+    function f { fire @args }
+    function rr { croshell @args }
+    function u { utils @args }
+    function t { terminal @args }
+
+}
+
+
+
+# sources end
 
 # try {
 #     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}

{machineconfig-6.87 → machineconfig-6.88}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.87" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.88" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"