machineconfig 7.64__py3-none-any.whl → 7.79__py3-none-any.whl

machineconfig/settings/shells/nushell/init.nu

@@ -1,127 +1,314 @@
-# Nushell initialization script
-# Translation of init.ps1 to Nushell
+# machineconfig Nushell initialization
 
+let config_root = (
+    $env.CONFIG_ROOT?
+    | default ($env.HOME | path join ".config" "machineconfig")
+)
 
+def ensure_directory [dir: string] -> nothing {
+    if (($dir | path exists) == false) {
+        try {
+            mkdir $dir
+        } catch {
+            null
+        }
+    }
+}
 
-# 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)
+def temp_file [prefix: string suffix: string] -> string {
+    let base_dir = (
+        $env.TMPDIR?
+        | default (
+            $env.TEMP?
+            | default (
+                $env.TMP?
+                | default "/tmp"
+            )
+        )
+    )
 
-    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 {
-        []
-    }
+    ensure_directory $base_dir
 
-    for dir in $directories {
-        if $dir not-in $path_entries {
-            $path_entries = ($path_entries | append $dir)
-        }
-    }
+    let token = (random uuid | str replace "-" "" | str substring 0..16)
+    let path = ($base_dir | path join $"($prefix)($token)($suffix)")
+
+    "" | save --force $path
 
-    $path_entries
+    $path
 }
 
-export-env {
-    let config_root = $"($env.HOME)/.config/machineconfig"
-    load-env { CONFIG_ROOT: $config_root }
+export def wrap_in_shell_script [command: string ...args: string] -> nothing {
+    let op_dir = ($env.HOME | path join "tmp_results" "tmp_scripts" "machineconfig")
+    ensure_directory $op_dir
 
-    let new_path = (add_to_path_if_not_already $"($config_root)/scripts" $"($env.HOME)/dotfiles/scripts/linux" "/usr/local/bin")
-    load-env { PATH: $new_path }
+    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")
 
-    # Source external scripts and define aliases
-    if ($"($config_root)/scripts" | 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")
+    print $"machineconfig: running ($command) at ($timestamp)"
+    print $"machineconfig: op program path ($op_program_path)"
 
-        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 run_status = (
+        try {
+            with-env { OP_PROGRAM_PATH: $op_program_path } {
+                run-external $command ...$args
             }
+            $env.LAST_EXIT_CODE? | default 0
+        } catch {
+            1
+        }
+    )
 
-            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)"
+    if ($op_program_path | path exists) {
+        let has_bat = (((which bat) | length) > 0)
+        if $has_bat {
+            run-external bat "--style=plain" "--paging=never" $op_program_path
+        } else {
+            print (open --raw $op_program_path)
+        }
 
-            let status = (try {
-                with-env { OP_PROGRAM_PATH: $op_program_path } {
-                    run-external $command ...$args
-                    $env.LAST_EXIT_CODE? | default 0
-                }
+        let follow_status = (
+            try {
+                run-external bash $op_program_path
+                $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
-                }
+        if $follow_status == 0 {
+            print $"machineconfig: completed ($command)"
+        } else {
+            print $"machineconfig: script exited with status ($follow_status)"
+        }
+    } else if $run_status == 0 {
+        print $"machineconfig: completed ($command)"
+    } else {
+        print $"machineconfig: ($command) exited with status ($run_status)"
+    }
+}
 
-                let follow_status = (try {
-                    run-external bash $op_program_path
-                    $env.LAST_EXIT_CODE? | default 0
+export def br [...args: string] -> nothing {
+    let cmd_file = (temp_file "broot-" ".cmd")
+
+    try {
+        run-external broot "--outcmd" $cmd_file ...$args
+    } catch {
+        if ($cmd_file | path exists) {
+            rm $cmd_file
+        }
+        return
+    }
+
+    if ($cmd_file | path exists) {
+        let command_text = (open --raw $cmd_file | str trim)
+        rm $cmd_file
+
+        if ($command_text | str length) > 0 {
+            let parsed_cd = (
+                try {
+                    $command_text
+                    | parse "cd \"{path}\""
+                    | get path
+                    | first
                 } catch {
-                    1
-                })
+                    null
+                }
+            )
 
-                if $follow_status == 0 {
-                    print $"machineconfig: completed '$command'"
-                } else {
-                    print $"machineconfig: program exited with status ($follow_status)"
+            if $parsed_cd != null {
+                if ($parsed_cd | str length) > 0 {
+                    cd $parsed_cd
                 }
-            } else if $status == 0 {
-                print $"machineconfig: completed '$command'"
             } else {
-                print $"machineconfig: '$command' exited with status ($status)"
+                try {
+                    run-external nu "-c" $command_text
+                } catch {
+                    null
+                }
             }
         }
+    }
+}
 
-        # 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 def lfcd [...args: string] -> nothing {
+    let tmp = (temp_file "lf-" ".tmp")
+
+    try {
+        run-external lf $"--last-dir-path=$tmp" ...$args
+    } catch {
+        null
+    }
+
+    if ($tmp | path exists) {
+        let dir = (open --raw $tmp | str trim)
+        rm $tmp
+
+        if (($dir | str length) > 0) and ($dir | path exists) {
+            cd $dir
+        }
     }
 }
 
-# Initialize zoxide if available
-# Patched by machineconfig from https://github.com/ajeetdsouza/zoxide
-try {
-    source <(zoxide init nushell)
-} catch {
-    # Do nothing if zoxide is not available
+export def y [...args: string] -> nothing {
+    let tmp = (temp_file "yazi-" ".tmp")
+
+    try {
+        run-external yazi ...$args $"--cwd-file=$tmp"
+    } catch {
+        null
+    }
+
+    if ($tmp | path exists) {
+        let dir = (open --raw $tmp | str trim)
+        rm $tmp
+
+        if (($dir | str length) > 0) and ($dir | path exists) {
+            cd $dir
+        }
+    }
 }
 
-# Initialize Starship prompt if available
-try {
-    source <(starship init nu)
-} catch {
-    # Do nothing if starship is not available
+export def tere [...args: string] -> nothing {
+    let result = (
+        try {
+            run-external tere ...$args | complete
+        } catch {
+            null
+        }
+    )
+
+    if $result != null {
+        let dest = ($result.stdout | str trim)
+        if (($dest | str length) > 0) and ($dest | path exists) {
+            cd $dest
+        }
+    }
+}
+
+export alias lf = lfcd
+
+export def d [...args: string] -> nothing {
+    wrap_in_shell_script "devops" ...$args
+}
+
+export def c [...args: string] -> nothing {
+    wrap_in_shell_script "cloud" ...$args
+}
+
+export def a [...args: string] -> nothing {
+    wrap_in_shell_script "agents" ...$args
+}
+
+export def s [...args: string] -> nothing {
+    wrap_in_shell_script "sessions" ...$args
+}
+
+export def fx [...args: string] -> nothing {
+    wrap_in_shell_script "ftpx" ...$args
+}
+
+export def f [...args: string] -> nothing {
+    wrap_in_shell_script "fire" ...$args
+}
+
+export def r [...args: string] -> nothing {
+    wrap_in_shell_script "croshell" ...$args
+}
+
+export def u [...args: string] -> nothing {
+    wrap_in_shell_script "utils" ...$args
+}
+
+export def t [...args: string] -> nothing {
+    wrap_in_shell_script "terminal" ...$args
+}
+
+export def ms [...args: string] -> nothing {
+    wrap_in_shell_script "msearch" ...$args
+}
+
+export def x [...args: string] -> nothing {
+    wrap_in_shell_script "explore" ...$args
+}
+
+export alias l = lsd -la
+
+let starship_cache_dir = ($env.HOME | path join ".cache" "starship")
+if (((which starship) | length) > 0) {
+    ensure_directory $starship_cache_dir
+    let starship_init = ($starship_cache_dir | path join "init.nu")
+
+    try {
+        starship init nu | save --force $starship_init
+    } catch {
+        try {
+            starship init nu | save $starship_init
+        } catch {
+            null
+        }
+    }
+
+    try {
+        source $starship_init
+    } catch {
+        null
+    }
+
+    try {
+        use $starship_init starship
+    } catch {
+        null
+    }
+}
+
+let zoxide_init = ($env.HOME | path join ".zoxide.nu")
+if (((which zoxide) | length) > 0) {
+    try {
+        zoxide init nushell | save --force $zoxide_init
+    } catch {
+        try {
+            zoxide init nushell | save $zoxide_init
+        } catch {
+            null
+        }
+    }
+
+    try {
+        source $zoxide_init
+    } catch {
+        null
+    }
+}
+
+let mcfly_cache_dir = ($env.HOME | path join ".cache" "mcfly")
+if (((which mcfly) | length) > 0) {
+    ensure_directory $mcfly_cache_dir
+    let mcfly_init = ($mcfly_cache_dir | path join "init.nu")
+
+    try {
+        mcfly init nu | save --force $mcfly_init
+    } catch {
+        try {
+            mcfly init nu | save $mcfly_init
+        } catch {
+            null
+        }
+    }
+
+    try {
+        source $mcfly_init
+    } catch {
+        null
+    }
+}
+
+let user_init = ($env.HOME | path join "dotfiles" "machineconfig" "init_nu.nu")
+if ($user_init | path exists) {
+    try {
+        source $user_init
+    } catch {
+        null
+    }
 }
-# 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/pwsh/init.ps1

@@ -15,6 +15,7 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
+    "$HOME\.local\bin",
     "$CONFIG_ROOT\scripts",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",

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.64" devops'
-alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" cloud'
-alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" agents'
-alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" sessions'
-alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" ftpx'
-alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" fire'
-alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" croshell'
-alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" utils'
-alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" terminal'
-alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.64" msearch'
+alias devops='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" devops'
+alias cloud='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" cloud'
+alias agents='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" agents'
+alias sessions='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" sessions'
+alias ftpx='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" ftpx'
+alias fire='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" fire'
+alias croshell='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" croshell'
+alias utils='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" utils'
+alias terminal='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" terminal'
+alias msearch='$HOME/.local/bin/uvx --python 3.14 --from "machineconfig>=7.79" msearch'
 
 alias d='wrap_in_shell_script devops'
 alias c='wrap_in_shell_script cloud'

machineconfig/setup_windows/uv.ps1

@@ -7,4 +7,11 @@ if (-not (Test-Path -Path "$HOME\.local\bin\uv.exe")) {
     Write-Output "uv binary found, updating..."
     & "$HOME\.local\bin\uv.exe" self update
 }
-& "$HOME\.local\bin\uv.exe" python install 3.14
+
+# `C:\Users\aalsaf01\.local\bin` is not on your PATH. To use installed Python executables, run `$env:PATH = "C:\Users\aalsaf01\.local\bin;$env:PATH"` or `uv python update-shell`.
+& "$env:USERPROFILE\.local\bin\uv.exe" python update-shell
+$env:Path = [System.Environment]::GetEnvironmentVariable('Path', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('Path', 'User')
+
+# & "$HOME\.local\bin\uv.exe" python install 3.14
+uv python install 3.14
+

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.64" devops $args }
-function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" cloud $args }
-function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" agents $args }
-function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" sessions $args }
-function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" ftpx $args }
-function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" fire $args }
-function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" croshell $args }
-function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" utils $args }
-function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" terminal $args }
-function msearch  { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.64" msearch $args }
+function devops   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" devops $args }
+function cloud    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" cloud $args }
+function agents   { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" agents $args }
+function sessions { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" sessions $args }
+function ftpx     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" ftpx $args }
+function fire     { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" fire $args }
+function croshell { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" croshell $args }
+function utils    { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" utils $args }
+function terminal { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" terminal $args }
+function msearch  { & "$HOME\.local\bin\uvx.exe" --python 3.14 --from "machineconfig>=7.79" msearch $args }
 
 function d { wrap_in_shell_script devops @args }
 function c { wrap_in_shell_script cloud @args }

machineconfig/setup_windows/web_shortcuts/quick_init.ps1

@@ -1,7 +1,8 @@
 
 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
-uv tool install --upgrade  --python 3.14 machineconfig both
+
+uv tool install --upgrade  --python 3.14 machineconfig
 
 devops install --group sysabc
 
@@ -12,5 +13,5 @@ devops config shell
 devops config shell --which nushell
 
 wt  # start Windows Terminal to pick up config changes
-devops install --group termabc
+devops install --group termabc 
 devops install --group gui

machineconfig/utils/accessories.py

@@ -1,4 +1,3 @@
-from pathlib import Path
 from typing import Optional, Any
 
 from datetime import datetime, timezone, timedelta
@@ -96,14 +95,18 @@ def human_friendly_dict(d: dict[str, Any]) -> dict[str, Any]:
     return result
 
 
-def get_repo_root(path: Path) -> Optional[Path]:
+def get_repo_root(path: "Path") -> Optional["Path"]:
     from git import Repo, InvalidGitRepositoryError
-
     try:
-        repo = Repo(str(path), search_parent_directories=True)
+        repo = Repo(path, search_parent_directories=True)
         root = repo.working_tree_dir
         if root is not None:
+            from pathlib import Path
             return Path(root)
     except InvalidGitRepositoryError:
         pass
     return None
+
+
+if __name__ == "__main__":
+    from pathlib import Path

machineconfig/utils/code.py

@@ -38,14 +38,16 @@ def get_uv_command_executing_python_script(python_script: str, uv_with: Optional
         uv_project_dir_arg = "--project" + f' "{uv_project_dir}"'
     else:
         uv_project_dir_arg = ""
-    print_code_string = lambda_to_python_script(lambda: print_code(code=python_script, lexer="python", desc="Temporary Python Script", subtitle="Executing via shell script"), in_global=True, import_module=False)
+    print_code_string = lambda_to_python_script(lambda: print_code(code=python_script, lexer="python", desc="Temporary Python Script", subtitle="Executing via shell script"),
+                                                in_global=True, import_module=False)
     python_file.write_text(print_code_string + "\n" + python_script, encoding="utf-8")
     shell_script = f"""uv run {uv_with_arg} {uv_project_dir_arg}  {str(python_file)} """
     return shell_script, python_file
 
 
 def run_lambda_function(lmb: Callable[[], Any], uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> None:
-    code = lambda_to_python_script(lmb, in_global=True, import_module=False)
+    code = lambda_to_python_script(lmb,
+                                            in_global=True, import_module=False)
     uv_command, _py_file = get_uv_command_executing_python_script(python_script=code, uv_with=uv_with, uv_project_dir=uv_project_dir)
     run_shell_script(uv_command)
 def run_python_script_in_marimo(py_script: str, uv_project_with: Optional[str]):