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

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

@@ -1,11 +1,12 @@
 
 
+$CONFIG_ROOT = "$HOME\.config\machineconfig"
+
 function Add-ToPathIfNotAlready {
     param (
         [Parameter(Mandatory=$true)]
         [string[]]$Directories
     )
-
     foreach ($dir in $Directories) {
         if ($env:Path -notlike "*$dir*") {
             $env:Path += ";$dir"
@@ -14,7 +15,8 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
-    "$HOME\code\machineconfig\src\machineconfig\scripts\windows",
+    "$HOME\.local\bin",
+    "$CONFIG_ROOT\scripts",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",
     "C:\Program Files\CodeBlocks\MinGW\bin",
@@ -22,32 +24,62 @@ Add-ToPathIfNotAlready -Directories @(
     "C:\Program Files\Graphviz\bin"
 )
 
-# $machineconfig_path = (python -c "print(__import__('machineconfig').__file__[:-12])")
-#C:\Program Files\Git\bin
-
-
 # sources  ================================================================
-. $HOME/code/machineconfig/src/machineconfig/settings/broot/brootcd.ps1
-. $HOME/code/machineconfig/src/machineconfig/settings/lf/windows/lfcd.ps1
-. $HOME/code/machineconfig/src/machineconfig/settings/tere/terecd.ps1
-
-function lsdla { lsd -la }
-Set-Alias -Name l -Value lsdla -Option AllScope
+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 }
 
-try {
-    Set-Alias -Name gcs -Value {gh copilot suggest -t shell}
-    Set-Alias -Name gcg -Value {gh copilot suggest -t git}
-    Set-Alias -Name gce -Value {gh copilot explain}
-    # Check for conflicts
-    # Get-Command gcs -ErrorAction SilentlyContinue
-    # Get-Command gcg -ErrorAction SilentlyContinue
-    # Get-Command gce -ErrorAction SilentlyContinue
 }
-catch {
-    # Do nothing
+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}
+#     Set-Alias -Name gcg -Value {gh copilot suggest -t git}
+#     Set-Alias -Name gce -Value {gh copilot explain}
+#     # Check for conflicts
+#     # Get-Command gcs -ErrorAction SilentlyContinue
+#     # Get-Command gcg -ErrorAction SilentlyContinue
+#     # Get-Command gce -ErrorAction SilentlyContinue
+# }
+# catch {
+#     # Do nothing
+# }
+
+
 # patches ===========================================================
 
 try {
@@ -61,24 +93,10 @@ 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>
-
+try {
+    # Initialize Starship prompt
+    Invoke-Expression (&starship init powershell)
+}
+catch {
+    # Do nothing
+}

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

@@ -6,19 +6,19 @@
     "copyOnSelect": true,
     "defaultProfile": "{574e775e-4f2a-5b96-ac1e-a2962a402336}",
     "focusFollowMouse": true,
-    "keybindings":
+    "keybindings": 
     [
         {
-            "id": "Terminal.TogglePaneZoom",
-            "keys": "ctrl+shift+z"
+            "id": "Terminal.FindText",
+            "keys": "ctrl+shift+f"
         },
         {
             "id": "Terminal.PasteFromClipboard",
             "keys": "ctrl+v"
         },
         {
-            "id": "Terminal.FindText",
-            "keys": "ctrl+shift+f"
+            "id": "Terminal.TogglePaneZoom",
+            "keys": "ctrl+shift+z"
         },
         {
             "id": "Terminal.DuplicatePaneAuto",
@@ -38,27 +38,27 @@
         }
     ],
     "launchMode": "fullscreen",
-    "newTabMenu":
+    "newTabMenu": 
     [
         {
             "type": "remainingProfiles"
         }
     ],
-    "profiles":
+    "profiles": 
     {
-        "defaults":
+        "defaults": 
         {
             "colorScheme": "Campbell (modified)",
             "padding": "0",
             "useAcrylic": false
         },
-        "list":
+        "list": 
         [
             {
                 "commandline": "pwsh",
                 "cursorColor": "#D4D8E1",
                 "cursorShape": "filledBox",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -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%"
@@ -84,7 +84,7 @@
             },
             {
                 "commandline": "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -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"
@@ -139,10 +148,16 @@
                 "hidden": false,
                 "name": "Ubuntu 22.04.3 LTS",
                 "source": "CanonicalGroupLimited.Ubuntu22.04LTS_79rhkp1fndgsc"
+            },
+            {
+                "guid": "{988a16a9-2179-5ba2-8367-4854ea3de17d}",
+                "hidden": false,
+                "name": "Ubuntu-24.04",
+                "source": "Microsoft.WSL"
             }
         ]
     },
-    "schemes":
+    "schemes": 
     [
         {
             "background": "#000000",