machineconfig 7.38__py3-none-any.whl → 7.44__py3-none-any.whl

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -1,28 +1,47 @@
-import git
-from rich.console import Console
-from rich.panel import Panel
-import typer
 
-from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.terminal import Response
-from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
-from machineconfig.utils.code import get_uv_command_executing_python_script
-from pathlib import Path
-import platform
-import subprocess
 from typing import Optional, Literal, Annotated
 
-
-console = Console()
+import typer
 
 
 def main(
     cloud: Annotated[Optional[str], typer.Option(..., "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config.")] = None,
     repo: Annotated[Optional[str], typer.Option(..., "--repo", "-r", help="Path to the local repository. Defaults to current working directory.")] = None,
     message: Annotated[Optional[str], typer.Option(..., "--message", "-m", help="Commit message for local changes.")] = None,
-    on_conflict: Annotated[Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"], typer.Option(..., "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
+    on_conflict: Annotated[Literal["ask", "a",
+                                   "push-local-merge", "p",
+                                   "overwrite-local", "o",
+                                   "stop-on-conflict", "s",
+                                   "remove-rclone-conflict", "r"
+                                   ], typer.Option(..., "--on-conflict", "-o", help="Action to take on merge conflict. Default is 'ask'.")] = "ask",
     pwd: Annotated[Optional[str], typer.Option(..., "--password", help="Password for encryption/decryption of the remote repository.")] = None,
 ):
+    on_conflict_mapper: dict[str, Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"]] = {
+        "a": "ask",
+        "ask": "ask",
+        "p": "push-local-merge",
+        "push-local-merge": "push-local-merge",
+        "o": "overwrite-local",
+        "overwrite-local": "overwrite-local",
+        "s": "stop-on-conflict",
+        "stop-on-conflict": "stop-on-conflict",
+        "r": "remove-rclone-conflict",
+        "remove-rclone-conflict": "remove-rclone-conflict",
+    }
+    on_conflict = on_conflict_mapper[on_conflict]
+    import git
+    from rich.console import Console
+    from rich.panel import Panel
+
+    from machineconfig.utils.path_extended import PathExtended
+    from machineconfig.utils.terminal import Response
+    from machineconfig.utils.source_of_truth import CONFIG_ROOT, DEFAULTS_PATH
+    from machineconfig.utils.code import get_uv_command_executing_python_script
+    from pathlib import Path
+    import platform
+    import subprocess
+    console = Console()
+
     if cloud is None:
         try:
             from machineconfig.utils.io import read_ini
@@ -80,7 +99,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=7.38"]
+        uv_with = ["machineconfig>=7.40"]
         uv_project_dir = None
 
     import tempfile

machineconfig/scripts/python/helpers_repos/count_lines_frontend.py

@@ -8,7 +8,7 @@ def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help=
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__)
     # --project $HOME/code/ machineconfig --group plot
-    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=7.38" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=7.40" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

machineconfig/scripts/python/machineconfig.py

@@ -9,6 +9,7 @@ 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
+from machineconfig.scripts.python.terminal import get_app as get_terminal_app
 
 def get_app():
     import typer
@@ -44,6 +45,12 @@ def get_app():
     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
+
+
+    terminal_app = get_terminal_app()
+    app.add_typer(terminal_app, name="terminal", help="[t] Terminal management commands", no_args_is_help=True)
+    app.add_typer(terminal_app, name="t", hidden=True)  # short alias
+
     return app
 
 

machineconfig/scripts/python/terminal.py

@@ -22,11 +22,13 @@ def choose_zellij_session(
             cmd = f"""zellij kill-sessions
     {cmd}"""
         from machineconfig.utils.code import exit_then_run_shell_script
-        exit_then_run_shell_script(cmd, strict=True)
+        exit_then_run_shell_script(script=cmd, strict=True)
         typer.Exit()
         return
     cmd = "zellij list-sessions"
     sessions: list[str] = subprocess.check_output(cmd, shell=True).decode().strip().split("\n")
+    # filter out empty lines and keep raw lines (they contain creation info)
+    sessions = [s for s in sessions if s.strip()]
     sessions.sort(key=lambda s: "EXITED" in s)
     if "current" in sessions:
         print("Already in a Zellij session, avoiding nesting and exiting.")
@@ -40,7 +42,18 @@ def choose_zellij_session(
         result = f"zellij attach {session}"
     else:
         from machineconfig.utils.options import choose_from_options
-        session = choose_from_options(msg="Choose a Zellij session to attach to:", multi=False, options=sessions, fzf=True)
+        # Artificially inject a "NEW SESSION" option so the user can create one from the list
+        NEW_SESSION_LABEL = "NEW SESSION"
+        options = [NEW_SESSION_LABEL] + sessions
+        session = choose_from_options(msg="Choose a Zellij session to attach to:", multi=False, options=options, fzf=True)
+        # If the user chose the artificial option, start a new session (same as --new-session)
+        if session == NEW_SESSION_LABEL:
+            cmd = "zellij --layout st2"
+            if kill_all:
+                cmd = f"zellij kill-sessions\n{cmd}"
+            from machineconfig.utils.code import exit_then_run_shell_script
+            exit_then_run_shell_script(cmd, strict=True)
+            raise typer.Exit()
         session = session.split(" [Created")[0]
         result = f"zellij attach {session}"
     from machineconfig.utils.code import exit_then_run_shell_script
@@ -93,7 +106,7 @@ def start_wt(layout_name: Annotated[str, typer.Argument(help="Layout name to sta
     # exit_then_run_shell_script(cmd, strict=True)
 
 
-def main():
+def get_app():
     app = typer.Typer(help="🖥️ Terminal utilities", no_args_is_help=True, add_help_option=False)
     app.command(name="attach-to-zellij", no_args_is_help=False, help="[z] Choose a Zellij session to attach to")(choose_zellij_session)
     app.command(name="z", hidden=True, no_args_is_help=False, help="[z] Choose a Zellij session to attach to")(choose_zellij_session)
@@ -103,6 +116,10 @@ def main():
 
     app.command(name="get-session-tabs", no_args_is_help=False, help="[zt] Get all Zellij session tabs.")(get_session_tabs)
     app.command(name="zt", hidden=True, no_args_is_help=False, help="[zt] Get all Zellij session tabs.")(get_session_tabs)
+    return app
+
+def main():
+    app = get_app()
     app()
 
 

machineconfig/scripts/windows/mounts/mount_ssh.ps1

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

@@ -31,6 +31,11 @@ function wrap_in_shell_script {
     # Check if the file exists
     if (Test-Path $env:OP_PROGRAM_PATH) {
         Write-Host "🚀 Taking over from python script @ $env:OP_PROGRAM_PATH"
+        try {
+            bat --style=full --theme=OneHalfDark --paging=never "$env:OP_PROGRAM_PATH"
+        } catch {
+            Write-Host "⚠️ Warning: Failed to display script content with 'bat'. Proceeding to execute the script."
+        }
         & $env:OP_PROGRAM_PATH
         Write-Host "✅ '$Command' execution completed."
     } else {

machineconfig/settings/helix/config.toml

@@ -25,3 +25,17 @@ enable = true
 max-wrap = 25 # increase value to reduce forced mid-word wrapping
 max-indent-retain = 0
 wrap-indicator = ""  # set wrap-indicator to "" to hide it
+
+
+# https://yazi-rs.github.io/docs/tips#helix-with-zellij
+# ~/.config/helix/config.toml
+[keys.normal]
+C-y = ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- bash ~/.config/helix/yazi-picker.sh open %{buffer_name}"
+# ~/.config/helix/config.toml
+[keys.normal.C-y]
+# Open the file(s) in the current window
+y = ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- bash ~/.config/helix/yazi-picker.sh open %{buffer_name}"
+# Open the file(s) in a vertical split
+v = ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- bash ~/.config/helix/yazi-picker.sh vsplit %{buffer_name}"
+# Open the file(s) in a horizontal split
+h = ":sh zellij run -n Yazi -c -f -x 10%% -y 10%% --width 80%% --height 80%% -- bash ~/.config/helix/yazi-picker.sh hsplit %{buffer_name}"

machineconfig/settings/lf/linux/exe/lfcd.sh

@@ -13,6 +13,7 @@
 #     bind '"\C-o":"lfcd\C-m"'  # bash
 #     bindkey -s '^o' 'lfcd\n'  # zsh
 #
+
 lfcd () {
     # 🔄 Create temporary file for directory tracking
     tmp="$(mktemp)"

machineconfig/settings/lf/linux/exe/previewer.sh

@@ -20,8 +20,9 @@ case "$file" in
     echo "x: $x, y: $y, width: $width, height: $height"
     
     if [ -n "$x" ]; then
-        echo "📐 Dimensions provided by caller, passing to viu"
-        viu "$file" -x "$x" -y "$y" -w "$width" -h "$height"
+        # echo "📐 Dimensions provided by caller, passing to viu"
+        # viu "$file" -x "$x" -y "$y" -w "$width" -h "$height"
+        # chafa --fit-width -f sixel "$file"
         echo "✅ Finished viu"
         chafa "$file"
         echo "✅ Finished chafa"

machineconfig/settings/shells/bash/init.sh

@@ -37,6 +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/settings/yazi/shell/yazi_cd.sh
 . $CONFIG_ROOT/scripts/linux/wrap_mcfg
 
 # check if file in ~/dotfiles/machineconfig/init_linux.sh exists and source it
@@ -56,7 +57,7 @@ alias r='wrap_in_shell_script croshell'
 alias u='wrap_in_shell_script utils'
 alias t='wrap_in_shell_script terminal'
 alias ms='wrap_in_shell_script msearch'
-
+alias x='. $CONFIG_ROOT/scripts/linux/wrap_mcfg explore'
 
 # alias gcs='gh copilot suggest -t shell'
 # alias gcg='gh copilot suggest -t git'

machineconfig/settings/shells/nushell/config.nu

@@ -1,33 +1,3 @@
 
 
-
-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
-
-
-# as per https://github.com/starship/starship?tab=readme-ov-file#step-1-install-starship
-# $nu.config-path
-use ~/.cache/starship/init.nu
-
-
-# https://github.com/fdncred/nu_plugin_parquet
-# plugin add ~/.cargo/bin/nu_plugin_parquet
-# https://github.com/FMotalleb/nu_plugin_port_list
-# plugin add ~/.cargo/bin/nu_plugin_port_list
-# https://github.com/FMotalleb/nu_plugin_qr_maker
-
-
-# source /home/alex/.config/broot/launcher/nushell/br
-# use '/home/alex/.config/broot/launcher/nushell/br' *
-
-
-# as per https://github.com/ajeetdsouza/zoxide?tab=readme-ov-file#installation
-source ~/.zoxide.nu
-
+use C:\Users\aalsaf01\.config\machineconfig\settings\shells\nushell\init.nu

machineconfig/settings/shells/nushell/init.nu

@@ -1,48 +1,110 @@
 # Nushell initialization script
 # Translation of init.ps1 to Nushell
 
-const CONFIG_ROOT = $"($env.HOME)/.config/machineconfig"
+
 
 # Add directories to PATH if not already present
 def add_to_path_if_not_already [...directories: string] {
+    let raw_path = ($env.PATH? | default [])
+    let path_type = ($raw_path | describe)
+
+    mut path_entries = if $path_type == "string" {
+        $raw_path | split row (char esep)
+    } else if $path_type == "list<string>" {
+        $raw_path
+    } else if $path_type == "nothing" {
+        []
+    } else {
+        []
+    }
+
     for dir in $directories {
-        if $dir not-in $env.PATH {
-            $env.PATH = ($env.PATH | append $dir)
+        if $dir not-in $path_entries {
+            $path_entries = ($path_entries | append $dir)
         }
     }
+
+    $path_entries
 }
 
-# Add directories to PATH
-add_to_path_if_not_already (
-    $"($CONFIG_ROOT)/scripts/linux"
-    $"($env.HOME)/dotfiles/scripts/linux"
-    "/usr/local/bin"
-)
-
-# Source external scripts and define aliases
-if ($"($CONFIG_ROOT)/scripts/linux" | path exists) {
-    # Source helper scripts
-    source $"($CONFIG_ROOT)/settings/broot/brootcd.nu"
-    source $"($CONFIG_ROOT)/settings/lf/linux/lfcd.nu"
-    source $"($CONFIG_ROOT)/settings/tere/terecd.nu"
-    source $"($CONFIG_ROOT)/scripts/linux/wrap_mcfg.nu"
-
-    # Define aliases and custom commands
-    def lsdla [] { lsd -la }
-    alias l = lsdla
-    
-    def d [...args: string] { wrap_in_shell_script devops ...$args }
-    def c [...args: string] { wrap_in_shell_script cloud ...$args }
-    def a [...args: string] { wrap_in_shell_script agents ...$args }
-    def ss [...args: string] { wrap_in_shell_script sessions ...$args }
-    def ff [...args: string] { wrap_in_shell_script ftpx ...$args }
-    def f [...args: string] { wrap_in_shell_script fire ...$args }
-    def rr [...args: string] { wrap_in_shell_script croshell ...$args }
-    def u [...args: string] { wrap_in_shell_script utils ...$args }
-    def t [...args: string] { wrap_in_shell_script terminal ...$args }
-    def ms [...args: string] { wrap_in_shell_script msearch ...$args }
-} else {
-    print $"Missing config files: ($CONFIG_ROOT)"
+export-env {
+    let config_root = $"($env.HOME)/.config/machineconfig"
+    load-env { CONFIG_ROOT: $config_root }
+
+    let new_path = (add_to_path_if_not_already $"($config_root)/scripts/linux" $"($env.HOME)/dotfiles/scripts/linux" "/usr/local/bin")
+    load-env { PATH: $new_path }
+
+    # Source external scripts and define aliases
+    if ($"($config_root)/scripts/linux" | path exists) {
+        # Source helper scripts
+    # let broot_script = ($config_root | path join "settings" "broot" "brootcd.nu")
+    # let lf_script = ($config_root | path join "settings" "lf" "linux" "lfcd.nu")
+    # let tere_script = ($config_root | path join "settings" "tere" "terecd.nu")
+
+        def wrap_in_shell_script [command: string ...args: string] -> nothing {
+            let op_dir = ($env.HOME | path join "tmp_results" "tmp_scripts" "machineconfig")
+            if ($op_dir | path exists) == false {
+                try { mkdir $op_dir } catch { null }
+            }
+
+            let random_name = (random uuid | str replace "-" "" | str substring 0..16)
+            let op_program_path = ($op_dir | path join $"($random_name).sh")
+            let timestamp = (date now --utc | format date "%Y-%m-%d %H:%M:%SZ")
+
+            print $"machineconfig: running ($command) at ($timestamp)"
+
+            let status = (try {
+                with-env { OP_PROGRAM_PATH: $op_program_path } {
+                    run-external $command ...$args
+                    $env.LAST_EXIT_CODE? | default 0
+                }
+            } catch {
+                1
+            })
+
+            if ($op_program_path | path exists) {
+                if (which bat | is-empty) {
+                    print (open --raw $op_program_path)
+                } else {
+                    run-external bat "--style=plain" "--paging=never" $op_program_path
+                }
+
+                let follow_status = (try {
+                    run-external bash $op_program_path
+                    $env.LAST_EXIT_CODE? | default 0
+                } catch {
+                    1
+                })
+
+                if $follow_status == 0 {
+                    print $"machineconfig: completed '$command'"
+                } else {
+                    print $"machineconfig: program exited with status ($follow_status)"
+                }
+            } else if $status == 0 {
+                print $"machineconfig: completed '$command'"
+            } else {
+                print $"machineconfig: '$command' exited with status ($status)"
+            }
+        }
+
+        # Define aliases and custom commands
+        def lsdla [] { lsd -la }
+        alias l = lsdla
+
+        def d [...args: string] { wrap_in_shell_script devops ...$args }
+        def c [...args: string] { wrap_in_shell_script cloud ...$args }
+        def a [...args: string] { wrap_in_shell_script agents ...$args }
+        def ss [...args: string] { wrap_in_shell_script sessions ...$args }
+        def ff [...args: string] { wrap_in_shell_script ftpx ...$args }
+        def f [...args: string] { wrap_in_shell_script fire ...$args }
+        def rr [...args: string] { wrap_in_shell_script croshell ...$args }
+        def u [...args: string] { wrap_in_shell_script utils ...$args }
+        def t [...args: string] { wrap_in_shell_script terminal ...$args }
+        def ms [...args: string] { wrap_in_shell_script msearch ...$args }
+    } else {
+        print $"Missing config files: ($config_root)"
+    }
 }
 
 # Initialize zoxide if available
@@ -59,3 +121,7 @@ try {
 } catch {
     # Do nothing if starship is not available
 }
+# as per https://github.com/starship/starship?tab=readme-ov-file#step-1-install-starship
+# $nu.config-path
+# use ~/.cache/starship/init.nu
+

machineconfig/settings/shells/wt/settings.json

@@ -99,14 +99,22 @@
                 "name": "Command Prompt"
             },
             {
-                "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
+                "guid": "{b1bc5929-2f8d-5b56-8c51-3e83379a5b63}",
                 "hidden": false,
                 "commandline": "nu.exe",
                 "name": "nushell"
                 // "source": "Windows.Terminal.Azure"
             },
             {
-                "guid": "{2ddc9f1a-8263-557a-8652-3db9e80a7164}",
+                "guid": "{4b9d9cef-cb7d-4a8c-8b08-0de52621c3ff}",
+                "hidden": false,
+                "commandline": "nu.exe",
+                "name": "nushell2",
+                "font": {
+                    "face": "CaskaydiaCove Nerd Font"
+                }
+            },
+            {
                 "hidden": false,
                 "name": "Developer Command Prompt for VS 2022",
                 "source": "Windows.Terminal.VisualStudio"

machineconfig/settings/yazi/init.lua

@@ -0,0 +1,36 @@
+
+
+-- https://yazi-rs.github.io/docs/tips#symlink-in-status
+-- Status:children_add(function(self)
+-- 	local h = self._current.hovered
+-- 	if h and h.link_to then
+-- 		return " -> " .. tostring(h.link_to)
+-- 	else
+-- 		return ""
+-- 	end
+-- end, 3300, Status.LEFT)
+
+
+--  https://yazi-rs.github.io/docs/tips#user-group-in-status
+-- Status:children_add(function()
+-- 	local h = cx.active.current.hovered
+-- 	if not h or ya.target_family() ~= "unix" then
+-- 		return ""
+-- 	end
+
+-- 	return ui.Line {
+-- 		ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"),
+-- 		":",
+-- 		ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"),
+-- 		" ",
+-- 	}
+-- end, 500, Status.RIGHT)
+
+
+-- https://yazi-rs.github.io/docs/tips#username-hostname-in-header
+-- Header:children_add(function()
+-- 	if ya.target_family() ~= "unix" then
+-- 		return ""
+-- 	end
+-- 	return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue")
+-- end, 500, Header.LEFT)

machineconfig/settings/yazi/keymap.toml

@@ -0,0 +1,52 @@
+
+[[mgr.prepend_keymap]]
+on   = "!"
+for  = "unix"
+run  = 'shell "$SHELL" --block'
+desc = "Open $SHELL here"
+
+# If you also using Yazi on Windows:
+[[mgr.prepend_keymap]]
+on   = "!"
+for  = "windows"
+run  = 'shell "powershell.exe" --block'
+desc = "Open PowerShell here"
+
+
+# FROM https://github.com/yazi-rs/plugins/tree/main/toggle-pane.yazi
+# keymap.toml
+[[mgr.prepend_keymap]]
+on   = "T"
+run  = "plugin toggle-pane min-preview"
+desc = "Show or hide the preview pane"
+# keymap.toml
+[[mgr.prepend_keymap]]
+on   = "T"
+run  = "plugin toggle-pane max-preview"
+desc = "Maximize or restore the preview pane"
+
+[[mgr.prepend_keymap]]
+on = "M"            # whatever key you choose
+run = "plugin toggle-pane"
+desc = "Toggle preview pane / maximize pane"
+
+
+# https://yazi-rs.github.io/docs/tips#macos-quick-look
+[[mgr.prepend_keymap]]
+on   = "<C-p>"
+run  = 'shell -- qlmanage -p "$@"'
+
+[[mgr.prepend_keymap]]
+on   = "F"
+run  = 'shell -- ~/.config/machineconfig/scripts/linux/wrap_mcfg fire "$0"'
+desc = "Run fire on hovered file"
+
+[[mgr.prepend_keymap]]
+on   = "R"
+run  = 'shell -- ~/.config/machineconfig/scripts/linux/wrap_mcfg croshell "$0"'
+desc = "Run croshell on hovered file"
+
+
+[[mgr.prepend_keymap]]
+on = [ "g", "r" ]
+run = 'shell -- ya emit cd "$(git rev-parse --show-toplevel)"'

machineconfig/settings/yazi/shell/yazi_cd.sh

@@ -0,0 +1,8 @@
+
+function y() {
+	local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
+	yazi "$@" --cwd-file="$tmp"
+	IFS= read -r -d '' cwd < "$tmp"
+	[ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd"
+	rm -f -- "$tmp"
+}

machineconfig/settings/yazi/yazi.toml

@@ -2,3 +2,11 @@
 [mgr]
 show_hidden = true
 ratio = [1, 3, 5]
+
+[plugin]
+dir = "~/.config/yazi/plugins"
+
+[[plugin.load]]
+name = "toggle-pane"
+path = "toggle-pane.yazi"
+

machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -2,16 +2,16 @@
 . <( 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/wrap_mcfg")
 
-alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" terminal'
-alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.38" msearch'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" terminal'
+alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.40" msearch'
 
 alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'

machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -3,16 +3,16 @@
 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/wrap_mcfg.ps1").Content
 
-function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" terminal $args }
-function msearch    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.38" msearch $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" terminal $args }
+function msearch    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.40" msearch $args }
 
 function d { wrap_in_shell_script devops @args }
 function c { wrap_in_shell_script cloud @args }

machineconfig/utils/code.py

@@ -129,7 +129,7 @@ def exit_then_run_shell_script(script: str, strict: bool = False):
             else:
                 suffix = ".sh"
                 lexer = "bash"
-            op_program_path = Path.home().joinpath("tmp_results", "tmp_scripts", "manual_run", f"manual_script_{randstr()}.{suffix}")
+            op_program_path = Path.home().joinpath("tmp_results", "tmp_scripts", "manual_run", f"manual_script_{randstr()}{suffix}")
             op_program_path.parent.mkdir(parents=True, exist_ok=True)
             op_program_path.write_text(script, encoding="utf-8")
             print_code(script, lexer=lexer, desc="script to run manually")