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

machineconfig/settings/shells/nushell/init.nu

@@ -1,80 +1,59 @@
 # machineconfig Nushell initialization
 
-let config_root = (
-    $env.CONFIG_ROOT?
-    | default ($env.HOME | path join ".config" "machineconfig")
-)
+# Cross-platform home directory helper
+def get_home []: nothing -> string {
+    $env.HOME? | default ($env.USERPROFILE? | default $nu.home-path)
+}
 
-def ensure_directory [dir: string] -> nothing {
-    if (($dir | path exists) == false) {
-        try {
-            mkdir $dir
-        } catch {
-            null
-        }
-    }
+def get_config_root []: nothing -> string {
+    $env.CONFIG_ROOT? | default ((get_home) | path join ".config" "machineconfig")
 }
 
-def temp_file [prefix: string suffix: string] -> string {
-    let base_dir = (
-        $env.TMPDIR?
-        | default (
-            $env.TEMP?
-            | default (
-                $env.TMP?
-                | default "/tmp"
-            )
-        )
-    )
+def ensure_directory [dir: string] {
+    if not ($dir | path exists) {
+        try { mkdir $dir } catch { }
+    }
+}
 
+def temp_file [prefix: string, suffix: string]: nothing -> 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
+    let file_path = ($base_dir | path join $"($prefix)($token)($suffix)")
+    "" | save --force $file_path
+    $file_path
 }
 
-export def wrap_in_shell_script [command: string ...args: string] -> nothing {
-    let op_dir = ($env.HOME | path join "tmp_results" "tmp_scripts" "machineconfig")
+export def wrap_in_shell_script [command: string, ...args: string] {
+    let op_dir = ((get_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")
+    let timestamp = (date now | 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
-        }
-    )
+    let run_status = try {
+        with-env { OP_PROGRAM_PATH: $op_program_path } { ^$command ...$args }
+        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
+        if (which bat | is-not-empty) {
+            ^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
-            }
-        )
+        let follow_status = try {
+            ^bash $op_program_path
+            0
+        } catch {
+            1
+        }
 
         if $follow_status == 0 {
             print $"machineconfig: completed ($command)"
@@ -88,99 +67,54 @@ export def wrap_in_shell_script [command: string ...args: string] -> nothing {
     }
 }
 
-export def br [...args: string] -> nothing {
+export def --env br [...args: string] {
     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
-    }
-
+    try { ^broot "--outcmd" $cmd_file ...$args } catch { rm --force $cmd_file; return }
     if ($cmd_file | path exists) {
         let command_text = (open --raw $cmd_file | str trim)
-        rm $cmd_file
-
+        rm --force $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
-                }
+            let parsed_cd = try {
+                $command_text | parse "cd \"{path}\"" | get path | first
+            } catch { null }
+            if $parsed_cd != null and ($parsed_cd | str length) > 0 {
+                cd $parsed_cd
             } else {
-                try {
-                    run-external nu "-c" $command_text
-                } catch {
-                    null
-                }
+                try { nu -c $command_text } catch { }
             }
         }
     }
 }
 
-export def lfcd [...args: string] -> nothing {
+export def --env lfcd [...args: string] {
     let tmp = (temp_file "lf-" ".tmp")
-
-    try {
-        run-external lf $"--last-dir-path=$tmp" ...$args
-    } catch {
-        null
-    }
-
+    try { ^lf $"--last-dir-path=($tmp)" ...$args } catch { }
     if ($tmp | path exists) {
         let dir = (open --raw $tmp | str trim)
-        rm $tmp
-
-        if (($dir | str length) > 0) and ($dir | path exists) {
+        rm --force $tmp
+        if ($dir | str length) > 0 and ($dir | path exists) {
             cd $dir
         }
     }
 }
 
-export def y [...args: string] -> nothing {
+export def --env y [...args: string] {
     let tmp = (temp_file "yazi-" ".tmp")
-
-    try {
-        run-external yazi ...$args $"--cwd-file=$tmp"
-    } catch {
-        null
-    }
-
+    try { ^yazi ...$args $"--cwd-file=($tmp)" } catch { }
     if ($tmp | path exists) {
         let dir = (open --raw $tmp | str trim)
-        rm $tmp
-
-        if (($dir | str length) > 0) and ($dir | path exists) {
+        rm --force $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
-        }
-    )
-
+export def --env tere_cd [...args: string] {
+    let result = try { ^tere ...$args | complete } catch { null }
     if $result != null {
         let dest = ($result.stdout | str trim)
-        if (($dest | str length) > 0) and ($dest | path exists) {
+        if ($dest | str length) > 0 and ($dest | path exists) {
             cd $dest
         }
     }
@@ -188,127 +122,17 @@ export def tere [...args: string] -> nothing {
 
 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 def d [...args: string] { wrap_in_shell_script "devops" ...$args }
+export def c [...args: string] { wrap_in_shell_script "cloud" ...$args }
+export def a [...args: string] { wrap_in_shell_script "agents" ...$args }
+export def s [...args: string] { wrap_in_shell_script "sessions" ...$args }
+export def fx [...args: string] { wrap_in_shell_script "ftpx" ...$args }
+export def f [...args: string] { wrap_in_shell_script "fire" ...$args }
+export def r [...args: string] { wrap_in_shell_script "croshell" ...$args }
+export def u [...args: string] { wrap_in_shell_script "utils" ...$args }
+export def t [...args: string] { wrap_in_shell_script "terminal" ...$args }
+export def ms [...args: string] { wrap_in_shell_script "msearch" ...$args }
+export def x [...args: string] { 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

@@ -16,12 +16,14 @@ function Add-ToPathIfNotAlready {
 
 Add-ToPathIfNotAlready -Directories @(
     "$HOME\.local\bin",
+    "$HOME\.bun\bin",
     "$CONFIG_ROOT\scripts",
     "$HOME\dotfiles\scripts\windows",
     "C:\Program Files (x86)\GnuWin32\bin",
     "C:\Program Files\CodeBlocks\MinGW\bin",
     "C:\Program Files\nu\bin",
-    "C:\Program Files\Graphviz\bin"
+    "C:\Program Files\Graphviz\bin",
+    "C:\Program Files\7-Zip"
 )
 
 # sources  ================================================================
@@ -34,15 +36,15 @@ if (Test-Path "$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 s { wrap_in_shell_script sessions $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 }
 
 }
@@ -53,16 +55,20 @@ else {
     function d { devops $args }
     function c { cloud $args }
     function a { agents $args }
-    function sx { sessions $args }
+    function s { 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 }
 }
 
 
+# Use bun as node if available
+if (Test-Path "$HOME\.bun\bin\bun.exe") {
+    Set-Alias -Name node -Value "$HOME\.bun\bin\bun.exe" -Option AllScope
+}
+
 
 # sources end
 
@@ -100,3 +106,63 @@ try {
 catch {
     # Do nothing
 }
+
+
+# history search =====================================================
+
+if (Get-Command atuin -ErrorAction SilentlyContinue) {
+    try {
+        Invoke-Expression (& atuin init powershell | Out-String)
+    }
+    catch {
+        # Do nothing
+    }
+}
+elseif (Get-Command mcfly -ErrorAction SilentlyContinue) {
+    try {
+        Invoke-Expression (& mcfly init powershell | Out-String)
+    }
+    catch {
+        # Do nothing
+    }
+}
+else {
+    try {
+        Import-Module PSReadLine -ErrorAction Stop | Out-Null
+        Set-PSReadLineKeyHandler -Chord Ctrl+r -ScriptBlock {
+            param($key, $arg)
+
+            $buffer = $null
+            $cursor = 0
+            try { [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$buffer, [ref]$cursor) } catch { }
+
+            $selected = $null
+            try {
+                [Console]::WriteLine()
+                $selected = (& tv pwsh-history 2>$null | Select-Object -First 1)
+            }
+            catch {
+                $selected = $null
+            }
+
+            if ([string]::IsNullOrWhiteSpace($selected)) {
+                return
+            }
+
+            $selected = $selected.TrimEnd("`r", "`n")
+
+            try {
+                $existingLen = if ($null -eq $buffer) { 0 } else { $buffer.Length }
+                [Microsoft.PowerShell.PSConsoleReadLine]::Replace(0, $existingLen, $selected)
+                try { [Microsoft.PowerShell.PSConsoleReadLine]::SetCursorPosition($selected.Length) } catch { }
+            }
+            catch {
+                try { [Microsoft.PowerShell.PSConsoleReadLine]::Insert($selected) } catch { }
+            }
+        }
+    }
+    catch {
+        # Do nothing
+    }
+}
+

machineconfig/settings/shells/pwsh/search_pwsh_history.ps1

@@ -0,0 +1,99 @@
+function Register-TvFuzzyHistoryKeyHandler {
+    [CmdletBinding()]
+    param(
+        [string]$Chord = "Ctrl+r",
+        [string]$Channel = "pwsh-history"
+    )
+
+    try {
+        Import-Module PSReadLine -ErrorAction Stop | Out-Null
+    }
+    catch {
+        return
+    }
+
+    $handler = {
+        param($key, $arg)
+
+        $tvCmd = Get-Command tv -ErrorAction SilentlyContinue
+        if ($null -eq $tvCmd) {
+            try {
+                [Microsoft.PowerShell.PSConsoleReadLine]::ReverseSearchHistory($key, $arg)
+                return
+            } catch { }
+            try {
+                [Microsoft.PowerShell.PSConsoleReadLine]::ReverseSearchHistory()
+                return
+            } catch { }
+            return
+        }
+
+        $buffer = $null
+        $cursor = 0
+        try { [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$buffer, [ref]$cursor) } catch { }
+
+        $currentPrompt = ""
+        if (-not [string]::IsNullOrEmpty($buffer)) {
+            if ($cursor -lt 0) { $cursor = 0 }
+            elseif ($cursor -gt $buffer.Length) { $cursor = $buffer.Length }
+            $currentPrompt = $buffer.Substring(0, $cursor)
+        }
+
+        $tvQuery = $currentPrompt
+        if (-not [string]::IsNullOrEmpty($tvQuery) -and ($tvQuery -match "[\r\n]")) {
+            $parts = $tvQuery -split "\r?\n"
+            $tvQuery = $parts[-1]
+        }
+
+        $selected = $null
+        $attempts = @(
+            @($Channel, "--input", $tvQuery, "--inline"),
+            @($Channel, "--input", $tvQuery),
+            @($Channel, "--inline"),
+            @($Channel)
+        )
+
+        $originalCursorPosition = $null
+        try { $originalCursorPosition = $Host.UI.RawUI.CursorPosition } catch { }
+        try { [Console]::WriteLine() } catch { }
+
+        foreach ($tvArgs in $attempts) {
+            $out = $null
+            try { $out = & tv @tvArgs 2>$null } catch { $out = $null }
+            if ($null -ne $out) {
+                $selected = ($out | Select-Object -First 1)
+                if (-not [string]::IsNullOrWhiteSpace($selected)) {
+                    break
+                }
+            }
+        }
+
+        if ($null -ne $originalCursorPosition) {
+            try { $Host.UI.RawUI.CursorPosition = $originalCursorPosition } catch { }
+        }
+
+        if ([string]::IsNullOrWhiteSpace($selected)) {
+            return
+        }
+
+        $selected = $selected.TrimEnd("`r", "`n")
+
+        try {
+            $existingLen = if ($null -eq $buffer) { 0 } else { $buffer.Length }
+            [Microsoft.PowerShell.PSConsoleReadLine]::Replace(0, $existingLen, $selected)
+            try { [Microsoft.PowerShell.PSConsoleReadLine]::SetCursorPosition($selected.Length) } catch { }
+        }
+        catch {
+            try { [Microsoft.PowerShell.PSConsoleReadLine]::Insert($selected) } catch { }
+        }
+    }
+
+    try {
+        Set-PSReadLineKeyHandler -Chord $Chord -BriefDescription "TvHistory" -Description "Fuzzy search history (tv)" -ScriptBlock $handler.GetNewClosure() -ErrorAction Stop
+    }
+    catch {
+        return
+    }
+}
+
+Register-TvFuzzyHistoryKeyHandler

machineconfig/settings/shells/wezterm/wezterm.lua

@@ -158,6 +158,10 @@ config.inactive_pane_hsb = {
 
 -- config.ime_preedit_rendering = 'System'
 config.enable_tab_bar = false
+config.hide_tab_bar_if_only_one_tab = true
+config.use_fancy_tab_bar = false
+config.show_tabs_in_tab_bar = true
+config.show_new_tab_button_in_tab_bar = false
 config.window_background_opacity = 0.98
 config.text_background_opacity = 1.0
 config.enable_scroll_bar = true