machineconfig 5.94__py3-none-any.whl → 5.96__py3-none-any.whl

machineconfig/scripts/python/ai/solutions/generic.py

@@ -48,7 +48,7 @@ def adjust_gitignore(repo_root: Path) -> None:
         "CLAUDE.md",
         "CRUSH.md",
         ".cursor",
-        ".clinerules"
+        ".clinerules",
         ".github/instructions",
         ".github/chatmodes",
         ".github/prompts",

machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -20,8 +20,13 @@ def update():
     uv self update
     uv tool install --upgrade machineconfig
     """
-    from machineconfig.utils.code import run_shell_script
-    run_shell_script(code)
+    import platform
+    if platform.system() == "Windows":
+        from machineconfig.utils.code import run_shell_script_after_exit
+        run_shell_script_after_exit(code)
+    else:
+        from machineconfig.utils.code import run_shell_script
+        run_shell_script(code)
 
 def interactive():
     """🤖 INTERACTIVE configuration of machine."""
@@ -101,3 +106,4 @@ def get_app():
     cli_app.command("readme", no_args_is_help=False, help="📚  [r] render readme markdown in terminal.")(readme)
     cli_app.command("r", no_args_is_help=False, hidden=True)(readme)
     return cli_app
+

machineconfig/settings/shells/bash/init.sh

@@ -12,10 +12,10 @@ CONFIG_ROOT="$HOME/.config/machineconfig"
 
 # 📂 Add directories to PATH
 add_to_path_if_not_already \
-    "$HOME/.local/bin" \
-    "$HOME/.cargo/bin" \
     "$CONFIG_ROOT/scripts/linux" \
     "$HOME/dotfiles/scripts/linux" \
+    "$HOME/.local/bin" \
+    "$HOME/.cargo/bin" \
     "/usr/games"
 # this way, if the script was run multiple times, e.g. due to nested shells in zellij, there will be no duplicates in the path
 # export DISPLAY=localhost:0.0  # xming server
@@ -26,10 +26,14 @@ 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
+# 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
@@ -57,20 +61,16 @@ alias cs=croshell
 # [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
 
+# https://github.com/atuinsh/atuin
+# eval "$(atuin init bash)"
+
 # source /home/alex/.config/broot/launcher/bash/br
 # eval "$(thefuck --alias)"
 # from https://github.com/ajeetdsouza/zoxide
 eval "$(zoxide init bash)"
 # from https://github.com/starship/starship
 eval "$(starship init bash)"
-# https://github.com/atuinsh/atuin
-# eval "$(atuin init bash)"
 # LEVE THIS IN THE END TO AVOID EXECUTION FAILURE OF THE REST OF THE SCRIPT
 # from https://github.com/cantino/mcfly
 eval "$(mcfly init bash)"
 
-# 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

machineconfig/settings/shells/pwsh/init.ps1

@@ -7,7 +7,6 @@ function Add-ToPathIfNotAlready {
         [Parameter(Mandatory=$true)]
         [string[]]$Directories
     )
-
     foreach ($dir in $Directories) {
         if ($env:Path -notlike "*$dir*") {
             $env:Path += ";$dir"
@@ -16,7 +15,7 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
-    "$CONFIG_ROOT\src\machineconfig\scripts\windows",
+    "$CONFIG_ROOT\scripts\windows",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",
     "C:\Program Files\CodeBlocks\MinGW\bin",
@@ -24,10 +23,6 @@ Add-ToPathIfNotAlready -Directories @(
     "C:\Program Files\Graphviz\bin"
 )
 
-# $machineconfig_path = (python -c "print(__import__('machineconfig').__file__[:-12])")
-#C:\Program Files\Git\bin
-
-
 # sources  ================================================================
 . $CONFIG_ROOT\settings\broot\brootcd.ps1
 . $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
@@ -36,7 +31,6 @@ Add-ToPathIfNotAlready -Directories @(
 
 function lsdla { lsd -la }
 Set-Alias -Name l -Value lsdla -Option AllScope
-
 function d { mcfg devops @args }
 function c { mcfg cloud @args }
 function a { mcfg agents @args }
@@ -44,8 +38,6 @@ function s { mcfg sessions @args }
 function ff { mcfg ftpx @args }
 function f { mcfg fire @args }
 function cs { mcfg croshell @args }
-
-
 try {
     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}
     Set-Alias -Name gcg -Value {gh copilot suggest -t git}
@@ -72,25 +64,3 @@ try {
 catch {
     # Do nothing
 }
-
-# try {
-#     Invoke-Expression -Command $(mcfly init powershell | out-string)
-# }
-# catch {
-#     # Do nothing
-# }
-
-
-# oh-my-posh --init --shell pwsh --config $env:USERPROFILE/AppData/Local/Programs/oh-my-posh/themes/atomicBit.omp.json | Invoke-Expression
-
-# try {
-#     Invoke-Expression (&starship init powershell)
-# }
-# catch {
-#     # Do nothing
-# # oh-my-posh --init --shell pwsh --config $env:USERPROFILE/AppData/Local/Programs/oh-my-posh/themes/atomicBit.omp.json | Invoke-Expression
-# }
-
-# Set-Alias lvim '~/.local/bin/lvim.ps1'
-# function fuck {     $history = (Get-History -Count 1).CommandLine;     if (-not [string]::IsNullOrWhiteSpace($history)) {         $f>
-

machineconfig/utils/code.py

@@ -1,6 +1,8 @@
 import platform
 from typing import Optional
 import subprocess
+import os
+# import time
 from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
@@ -134,3 +136,74 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     temp_script_path.unlink(missing_ok=True)
     console.print(f"🗑️  [blue]Temporary script deleted:[/blue] [green]{temp_script_path}[/green]")
     return proc
+
+
+def run_shell_script_after_exit(script: str, check_interval: float = 0.1, display_script: bool = True) -> subprocess.Popen[bytes]:
+    current_pid = os.getpid()
+    console = Console()
+    
+    if platform.system() == "Windows":
+        monitor_script = f"""$ErrorActionPreference = "Stop"
+$targetPid = {current_pid}
+$checkInterval = {check_interval}
+
+Write-Host "🔍 Monitoring process PID: $targetPid"
+
+while ($true) {{
+    $process = Get-Process -Id $targetPid -ErrorAction SilentlyContinue
+    if (-not $process) {{
+        Write-Host "✅ Process $targetPid has exited. Running script..."
+        break
+    }}
+    Start-Sleep -Seconds $checkInterval
+}}
+
+# Execute the provided script
+{script}
+"""
+        suffix = ".ps1"
+        cmd = ["powershell", "-ExecutionPolicy", "Bypass", "-NoProfile", "-WindowStyle", "Hidden", "-File"]
+    else:
+        monitor_script = f"""#!/bin/bash
+target_pid={current_pid}
+check_interval={check_interval}
+
+echo "🔍 Monitoring process PID: $target_pid"
+
+while kill -0 $target_pid 2>/dev/null; do
+    sleep $check_interval
+done
+
+echo "✅ Process $target_pid has exited. Running script..."
+
+# Execute the provided script
+{script}
+"""
+        suffix = ".sh"
+        cmd = ["bash"]
+    
+    monitor_script_path = PathExtended.tmp().joinpath("tmp_scripts", "monitor", randstr() + suffix)
+    monitor_script_path.parent.mkdir(parents=True, exist_ok=True)
+    monitor_script_path.write_text(monitor_script, encoding="utf-8")
+    
+    if display_script:
+        lexer = "powershell" if platform.system() == "Windows" else "bash"
+        console.print(Panel(Syntax(code=monitor_script, lexer=lexer), title=f"📄 Monitor script @ {monitor_script_path}", subtitle="Will run after current process exits"), style="bold yellow")
+    
+    if platform.system() != "Windows":
+        monitor_script_path.chmod(0o755)
+    
+    cmd.append(str(monitor_script_path))
+    
+    if platform.system() == "Windows":
+        creation_flags = subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS
+        process = subprocess.Popen(cmd, creationflags=creation_flags, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL)
+    else:
+        process = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, start_new_session=True)
+    
+    if display_script:
+        console.print(f"🚀 [green]Monitor process started with PID:[/green] [blue]{process.pid}[/blue]")
+        console.print(f"📍 [yellow]Watching PID:[/yellow] [blue]{current_pid}[/blue]")
+    
+    return process
+

{machineconfig-5.94.dist-info → machineconfig-5.96.dist-info}/METADATA

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

{machineconfig-5.94.dist-info → machineconfig-5.96.dist-info}/RECORD

@@ -139,7 +139,7 @@ machineconfig/scripts/python/ai/scripts/lint_and_type_check.ps1,sha256=m_z4vzLrv
 machineconfig/scripts/python/ai/scripts/lint_and_type_check.sh,sha256=Mt9D0LSEwbvVaq_wxTAch4NLyFUuDGHjn6rtEt_9alU,4615
 machineconfig/scripts/python/ai/solutions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/scripts/python/ai/solutions/_shared.py,sha256=rBniovmKZuY48T50cCyG_oeFZgSap365EXEadv9UtM4,603
-machineconfig/scripts/python/ai/solutions/generic.py,sha256=MRaEjyJC7VWi0klq_JEoeOmD6ZoFZIMoJXuHkTiuXSI,2363
+machineconfig/scripts/python/ai/solutions/generic.py,sha256=wXmajwy99GNCr1lPGPwavKHRgLtR8JrTalovYNn0kCg,2364
 machineconfig/scripts/python/ai/solutions/claude/claude.py,sha256=tVMdaOL_9jC1nvfPsJs9WRkPPNa2tQVyq4vxdpOPK6k,343
 machineconfig/scripts/python/ai/solutions/cline/cline.py,sha256=3nYdEmdk76sYerEvImEDi3Qi-n94ExFkg20HttI7iCc,446
 machineconfig/scripts/python/ai/solutions/copilot/github_copilot.py,sha256=spuPpENX_lZIBiANQq9eTxefoPBE2Ao_LEY16ZCaUQY,1890
@@ -178,7 +178,7 @@ machineconfig/scripts/python/devops_helpers/cli_config_dotfile.py,sha256=rjTys4F
 machineconfig/scripts/python/devops_helpers/cli_data.py,sha256=kvJ7g2CccjjXIhCwdu_Vlif8JHC0qUoLjuGcTSqT-IU,514
 machineconfig/scripts/python/devops_helpers/cli_nw.py,sha256=nI_zmcmUvijVeXIWT2dN5onoy3ou-lub1cL-SJImmDA,4125
 machineconfig/scripts/python/devops_helpers/cli_repos.py,sha256=GEsW0ykgu8mtoiXurOSjOlbY_Xrngy_aeBq4eRZY8ts,12335
-machineconfig/scripts/python/devops_helpers/cli_self.py,sha256=6tNrchY6-QStf4LfpCRvy36gBM3_GJIGC2OVCiz-iNo,4986
+machineconfig/scripts/python/devops_helpers/cli_self.py,sha256=WHrx980iGBMO_A-QiA4NyJ_2bvHBIe1nmhzwbczEOi0,5179
 machineconfig/scripts/python/devops_helpers/cli_share_server.py,sha256=q9pFJ6AxPuygMr3onMNOKEuuQHbVE_6Qoyo7xRT5FX0,4196
 machineconfig/scripts/python/devops_helpers/cli_terminal.py,sha256=k_PzXaiGyE0vXr0Ii1XcJz2A7UvyPJrR31TRWt4RKRI,6019
 machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py,sha256=nK47Rc7gQuDCnkk6_sW1y82gBnDJ9TdHU8XwMPFBK9c,5591
@@ -323,7 +323,7 @@ machineconfig/settings/rofi/config.rasi,sha256=nDX5B8wdXQYF1fwiOTBRJUI4l_gQbYaLa
 machineconfig/settings/rofi/config_default.rasi,sha256=rTfKnC-bZuWX1l-lWQACCUOE1ShhkfykAxtXX9PlQHE,4694
 machineconfig/settings/shells/alacritty/alacritty.toml,sha256=EbL-2Y4QunW1pvRWB2yuLCw8MMPONheJr5LFoWRieUQ,871
 machineconfig/settings/shells/alacritty/alacritty.yml,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig/settings/shells/bash/init.sh,sha256=vQCV0bnIh8nBiFq1d2YoToDqPdPTrCPDEeRFY0Om6sE,2266
+machineconfig/settings/shells/bash/init.sh,sha256=wVG9lTNy0C8CVSnt-6TSSM3EHRwPc7uU7jz3WVSrI3c,2266
 machineconfig/settings/shells/hyper/.hyper.js,sha256=h-HqeYlvPvPD4Ee7828Cxo87uVkzbMGJFqXTZIWoegw,8884
 machineconfig/settings/shells/ipy/profiles/default/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/settings/shells/ipy/profiles/default/startup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -331,7 +331,7 @@ machineconfig/settings/shells/ipy/profiles/default/startup/playext.py,sha256=OJ3
 machineconfig/settings/shells/kitty/kitty.conf,sha256=lDdx-dUX3jbKGb3BkS2f2TOpmgGiS-CI-_-lFvhD5A4,52870
 machineconfig/settings/shells/nushell/config.nu,sha256=ug0E0NXNlCzgStScFN6VTsAkUaOTPJZB69P-LS5L2VE,1047
 machineconfig/settings/shells/nushell/env.nu,sha256=4VmaXb-qP6qnMD5TPzkXMLFNlB5QC4l9HEzCvXZE2GQ,315
-machineconfig/settings/shells/pwsh/init.ps1,sha256=o98tqfAOZT89rclbhRmDBQ7zU9Rtdm_FvY8alXYGCN0,2647
+machineconfig/settings/shells/pwsh/init.ps1,sha256=NKTMy-8jhlnSi5kZQ9EkGAQqGmjQ1c8vQyb2YBah0NE,1833
 machineconfig/settings/shells/pwsh/profile.ps1,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/settings/shells/starship/starship.toml,sha256=5rQTY7ZpKnrnhgu2Y9OJKUYMz5lPLIftO1p1VRuVZwQ,1150
 machineconfig/settings/shells/vtm/settings.xml,sha256=5TNXd-i0eUGo2w3tuhY9aOkwoJdqih8_HO_U6uL2Dts,18262
@@ -383,7 +383,7 @@ machineconfig/setup_windows/wt_and_pwsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 machineconfig/setup_windows/wt_and_pwsh/set_wt_settings.py,sha256=ogxJnwpdcpH7N6dFJu95UCNoGYirZKQho_3X0F_hmXs,6791
 machineconfig/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 machineconfig/utils/accessories.py,sha256=W_9dLzjwNTW5JQk_pe3B2ijQ1nA2-8Kdg2r7VBtzgQs,4340
-machineconfig/utils/code.py,sha256=yUoRzw7jTL-f3I0liyxguyzpki8d1h1ieJmG6dHzkDQ,6300
+machineconfig/utils/code.py,sha256=CAjArgaT2ENhnsgwtGUYBRyAbs_tiMlX3PKy-Uz47c4,8901
 machineconfig/utils/installer.py,sha256=ZnhW_gRmGlq5uXwzNvIn-x1vXuOJxkzVqjNu188f37s,10465
 machineconfig/utils/io.py,sha256=rzEwAnq-gyT29Y4CDHHGxAA6ddIIFOCxrqZ6dn0ALa4,2255
 machineconfig/utils/links.py,sha256=KM6vIn3hag9FYEzLSHP5MAM9tU_RStw2mCq2_OvmmZA,23672
@@ -421,8 +421,8 @@ machineconfig/utils/schemas/installer/installer_types.py,sha256=QClRY61QaduBPJoS
 machineconfig/utils/schemas/layouts/layout_types.py,sha256=TcqlZdGVoH8htG5fHn1KWXhRdPueAcoyApppZsPAPto,2020
 machineconfig/utils/schemas/repos/repos_types.py,sha256=ECVr-3IVIo8yjmYmVXX2mnDDN1SLSwvQIhx4KDDQHBQ,405
 machineconfig/utils/ssh_utils/utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-machineconfig-5.94.dist-info/METADATA,sha256=RkrR24IGdAjvpYIIwt594YIkWuLUq_IYtBRqrDU0YDs,3012
-machineconfig-5.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-machineconfig-5.94.dist-info/entry_points.txt,sha256=M0jwN_brZdXWhmNVeXLvdKxfkv8WhhXFZYcuKBA9qnk,418
-machineconfig-5.94.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
-machineconfig-5.94.dist-info/RECORD,,
+machineconfig-5.96.dist-info/METADATA,sha256=pkyWaEW2JW25EIBCw6tu92LmMsnOv7dh_Y89Qa0QYSI,3012
+machineconfig-5.96.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+machineconfig-5.96.dist-info/entry_points.txt,sha256=M0jwN_brZdXWhmNVeXLvdKxfkv8WhhXFZYcuKBA9qnk,418
+machineconfig-5.96.dist-info/top_level.txt,sha256=porRtB8qms8fOIUJgK-tO83_FeH6Bpe12oUVC670teA,14
+machineconfig-5.96.dist-info/RECORD,,