machineconfig 6.82__py3-none-any.whl → 7.98__py3-none-any.whl

machineconfig/settings/marimo/marimo.toml

@@ -64,7 +64,7 @@ presets = []
 [experimental]
 
 [snippets]
-custom_paths = []
+custom_paths = ["/home/alex/code/machineconfig/src/machineconfig/settings/marimo/snippets"]
 include_default_snippets = true
 
 [save]

machineconfig/settings/marimo/snippets/globalize.py

@@ -0,0 +1,34 @@
+import marimo
+from typing import Any
+from types import FunctionType
+
+app = marimo.App(width="full")
+
+@app.cell(hide_code=True)
+def _(mo: Any):
+    mo.md(r"""# Globalize Lambda to Python Script""")
+    return
+
+
+@app.cell
+def _(func: FunctionType):
+    # Your snippet code
+    from machineconfig.utils.meta import lambda_to_python_script
+    exec(
+        lambda_to_python_script(
+            lambda: func(),
+            in_global=True,
+            import_module=False,
+        ),
+    )
+    return
+
+
+@app.cell
+def _():
+    import marimo as mo
+    return (mo,)
+
+
+if __name__ == "__main__":
+    app.run()

machineconfig/settings/shells/bash/init.sh

@@ -23,7 +23,7 @@ CONFIG_ROOT="$HOME/.config/machineconfig"
 
 # 📂 Add directories to PATH
 add_to_path_if_not_already \
-    "$CONFIG_ROOT/scripts/linux" \
+    "$CONFIG_ROOT/scripts" \
     "$HOME/dotfiles/scripts/linux" \
     "$HOME/.local/bin" \
     "$HOME/.cargo/bin" \
@@ -37,22 +37,27 @@ 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/wrap_mcfg
+
 # 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 d='wrap_in_shell_script devops'
+alias c='wrap_in_shell_script cloud'
+alias a='wrap_in_shell_script agents'
+alias s='wrap_in_shell_script sessions'
+alias fx='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 terminal'
+alias ms='wrap_in_shell_script msearch'
+alias x='wrap_in_shell_script explore'
 
 # alias gcs='gh copilot suggest -t shell'
 # alias gcg='gh copilot suggest -t git'
@@ -84,7 +89,34 @@ eval "$(zoxide init bash)"
 eval "$(starship 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)"
+if command -v mcfly &> /dev/null; then
+    eval "$(mcfly init bash)"
+else
+    # eval "$(tv init bash)"
+    tv_shell_history() {
+        _disable_bracketed_paste
+        local current_prompt="${READLINE_LINE:0:$READLINE_POINT}"
+        local output
+        # move to the next line so that the prompt is not overwritten
+        printf "\n"
+        # Get history using tv with the same arguments as zsh version
+        output=$(tv bash-history --input "$current_prompt" --inline)
+
+        if [[ -n "$output" ]]; then
+            # Clear the right side of cursor and set new line
+            READLINE_LINE="$output"
+            READLINE_POINT=${#READLINE_LINE}
+            # Uncomment this to automatically accept the line
+            # (i.e. run the command without having to press enter twice)
+            # accept-line() { echo; }; accept-line
+        fi
+        # move the cursor back to the previous line
+        printf "\033[A"
+        _enable_bracketed_paste
+    }
+    bind -x '"\C-r": tv_shell_history'
+fi
+
 
 # Show elapsed runtime
 # _show_elapsed

machineconfig/settings/shells/ipy/profiles/default/startup/playext.py

@@ -27,7 +27,7 @@
 # def print_code_interactive(_):
 #     res = get_names()
 #     from machineconfig.utils.utils import choose_from_options
-#     choice = choose_from_options(multi=False, options=res["<class 'function'>"], msg="Choose a type to inspect", fzf=True)
+#     choice = choose_from_options(multi=False, options=res["<class 'function'>"], msg="Choose a type to inspect", tv=True)
 #     obj = eval(choice, globals(), locals())  # type: ignore  # pylint: disable=eval-used
 #     from rich.syntax import Syntax
 #     import inspect

machineconfig/settings/shells/nushell/config.nu

@@ -1,33 +1,3 @@
+# machineconfig Nushell configuration loader
 
-
-
-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 "~/.config/machineconfig/settings/shells/nushell/init.nu"

machineconfig/settings/shells/nushell/env.nu

@@ -1,13 +1,52 @@
+# machineconfig Nushell environment setup
 
+def reduce_non_empty [segments: list<string>] -> list<string> {
+	segments
+	| reduce --fold [] { |segment, acc|
+		if (($segment | str length) > 0) {
+			$acc | append $segment
+		} else {
+			$acc
+		}
+	}
+}
 
-# as per https://github.com/starship/starship?tab=readme-ov-file#step-1-install-starship
-mkdir ~/.cache/starship
-starship init nu | save -f ~/.cache/starship/init.nu
+let default_root = ($env.HOME | path join ".config" "machineconfig")
+let config_root = (
+	$env.CONFIG_ROOT?
+	| default $default_root
+	| path expand
+)
 
+load-env { CONFIG_ROOT: $config_root }
 
+let existing_segments = (
+	$env.PATH?
+	| default ""
+	| split row (char esep)
+	| reduce_non_empty
+)
 
-# echo $nu.env-path
-# as per https://github.com/ajeetdsouza/zoxide?tab=readme-ov-file#installation
-zoxide init nushell | save -f ~/.zoxide.nu
+let desired_paths = [
+	($config_root | path join "scripts")
+	($env.HOME | path join "dotfiles" "scripts" "linux")
+	($env.HOME | path join ".local" "bin")
+	($env.HOME | path join ".cargo" "bin")
+	"/usr/games"
+]
+
+let merged_segments = (
+	$desired_paths
+	| reduce --fold $existing_segments { |entry, acc|
+		if (($entry | path exists) and (not ($entry in $acc))) {
+			$acc | append $entry
+		} else {
+			$acc
+		}
+	}
+)
+
+let new_path = ($merged_segments | str join (char esep))
+load-env { PATH: $new_path }
 
 

machineconfig/settings/shells/nushell/init.nu

@@ -0,0 +1,314 @@
+# 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
+        }
+    }
+}
+
+def temp_file [prefix: string suffix: string] -> string {
+    let base_dir = (
+        $env.TMPDIR?
+        | default (
+            $env.TEMP?
+            | default (
+                $env.TMP?
+                | default "/tmp"
+            )
+        )
+    )
+
+    ensure_directory $base_dir
+
+    let token = (random uuid | str replace "-" "" | str substring 0..16)
+    let path = ($base_dir | path join $"($prefix)($token)($suffix)")
+
+    "" | save --force $path
+
+    $path
+}
+
+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 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)"
+    print $"machineconfig: op program path ($op_program_path)"
+
+    let run_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) {
+        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 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: script exited with status ($follow_status)"
+        }
+    } else if $run_status == 0 {
+        print $"machineconfig: completed ($command)"
+    } else {
+        print $"machineconfig: ($command) exited with status ($run_status)"
+    }
+}
+
+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 {
+                    null
+                }
+            )
+
+            if $parsed_cd != null {
+                if ($parsed_cd | str length) > 0 {
+                    cd $parsed_cd
+                }
+            } else {
+                try {
+                    run-external nu "-c" $command_text
+                } catch {
+                    null
+                }
+            }
+        }
+    }
+}
+
+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
+        }
+    }
+}
+
+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
+        }
+    }
+}
+
+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
+    }
+}
+

machineconfig/settings/shells/pwsh/init.ps1

@@ -15,7 +15,8 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
-    "$CONFIG_ROOT\scripts\windows",
+    "$HOME\.local\bin",
+    "$CONFIG_ROOT\scripts",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",
     "C:\Program Files\CodeBlocks\MinGW\bin",
@@ -24,21 +25,46 @@ Add-ToPathIfNotAlready -Directories @(
 )
 
 # sources  ================================================================
-. $CONFIG_ROOT\settings\broot\brootcd.ps1
-. $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
-. $CONFIG_ROOT\settings\tere\terecd.ps1
+if (Test-Path "$CONFIG_ROOT\scripts\wrap_mcfg.ps1") {
+    . $CONFIG_ROOT\settings\broot\brootcd.ps1
+    . $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
+    . $CONFIG_ROOT\settings\tere\terecd.ps1
+    . $CONFIG_ROOT\settings\yazi\shell\yazi_cd.ps1
+    . $CONFIG_ROOT\scripts\wrap_mcfg.ps1
 
+    function lsdla { lsd -la }
+    Set-Alias -Name l -Value lsdla -Option AllScope
+    function d { wrap_in_shell_script devops $args }
+    function c { wrap_in_shell_script cloud $args }
+    function a { wrap_in_shell_script agents $args }
+    function sx { wrap_in_shell_script sessions $args }
+    function fx { wrap_in_shell_script ftpx $args }
+    function f { wrap_in_shell_script fire $args }
+    function rr { wrap_in_shell_script croshell $args }
+    function u { wrap_in_shell_script utils $args }
+    function t { wrap_in_shell_script terminal $args }
+    function ms { wrap_in_shell_script msearch $args }
 
-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 }
+}
+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 sx { sessions $args }
+    function fx { ftpx $args }
+    function f { fire $args }
+    function rr { croshell $args }
+    function u { utils $args }
+    function t { terminal $args }
+    function ms { msearch $args }
+}
+
+
+
+# sources end
 
 # try {
 #     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}

machineconfig/settings/shells/starship/starship.toml

@@ -56,3 +56,19 @@ nu_indicator = '󰟆'
 unknown_indicator = 'mystery shell'
 style = 'cyan bold'
 disabled = false
+
+
+[git_branch]
+disabled = true
+ 
+[git_commit]
+disabled = true
+ 
+[git_state]
+disabled = true
+ 
+[git_status]
+disabled = true
+ 
+[git_metrics]
+disabled = true

machineconfig/settings/shells/wezterm/wezterm.lua

@@ -190,4 +190,6 @@ end
 
 
 -- and finally, return the configuration to wezterm
+-- config.enable_osc133 = false  -- to silence: P>|WezTerm 20240203-110809-5046fc22\
+
 return config

machineconfig/settings/shells/wt/settings.json

@@ -70,7 +70,7 @@
                 "startingDirectory": "%USERPROFILE%"
             },
             {
-                "commandline": "powershell.exe -Command \"$HOME/scripts/croshell.ps1\"",
+                "commandline": "powershell.exe -Command \"rr\"",
                 "guid": "{1e951406-6597-48c7-8137-b967bed19572}",
                 "name": "croshell",
                 "startingDirectory": "%USERPROFILE%"
@@ -99,13 +99,22 @@
                 "name": "Command Prompt"
             },
             {
-                "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
+                "guid": "{b1bc5929-2f8d-5b56-8c51-3e83379a5b63}",
                 "hidden": false,
-                "name": "Azure Cloud Shell",
-                "source": "Windows.Terminal.Azure"
+                "commandline": "nu.exe",
+                "name": "nushell"
+                // "source": "Windows.Terminal.Azure"
+            },
+            {
+                "guid": "{4b9d9cef-cb7d-4a8c-8b08-0de52621c3ff}",
+                "hidden": false,
+                "commandline": "nu.exe",
+                "name": "nushell2",
+                "font": {
+                    "face": "CaskaydiaCove Nerd Font"
+                }
             },
             {
-                "guid": "{2ddc9f1a-8263-557a-8652-3db9e80a7164}",
                 "hidden": false,
                 "name": "Developer Command Prompt for VS 2022",
                 "source": "Windows.Terminal.VisualStudio"