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

machineconfig/settings/shells/pwsh/init.ps1

@@ -15,30 +15,64 @@ function Add-ToPathIfNotAlready {
 }
 
 Add-ToPathIfNotAlready -Directories @(
-    "$CONFIG_ROOT\scripts\windows",
+    "$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  ================================================================
-. $CONFIG_ROOT\settings\broot\brootcd.ps1
-. $CONFIG_ROOT\settings\lf\windows\lfcd.ps1
-. $CONFIG_ROOT\settings\tere\terecd.ps1
-
-
-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 }
+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 }
+
+}
+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 }
+}
+
+
+# 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
 
 # try {
 #     Set-Alias -Name gcs -Value {gh copilot suggest -t shell}
@@ -74,3 +108,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/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

@@ -157,7 +157,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
@@ -190,4 +193,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

@@ -55,7 +55,7 @@
         "list": 
         [
             {
-                "commandline": "pwsh",
+                "commandline": "C:\\Program Files\\PowerShell\\7\\pwsh.exe",
                 "cursorColor": "#D4D8E1",
                 "cursorShape": "filledBox",
                 "font": 
@@ -69,19 +69,6 @@
                 "source": "Windows.Terminal.PowershellCore",
                 "startingDirectory": "%USERPROFILE%"
             },
-            {
-                "commandline": "powershell.exe -Command \"$HOME/scripts/croshell.ps1\"",
-                "guid": "{1e951406-6597-48c7-8137-b967bed19572}",
-                "name": "croshell",
-                "startingDirectory": "%USERPROFILE%"
-            },
-            {
-                "commandline": "wsl -d Ubuntu -- cd ~",
-                "guid": "{8fe5c33b-0346-4127-acde-0e2bd4c587ab}",
-                "hidden": false,
-                "name": "Ubuntu",
-                "startingDirectory": "%USERPROFILE%"
-            },
             {
                 "commandline": "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
                 "font": 
@@ -99,13 +86,23 @@
                 "name": "Command Prompt"
             },
             {
-                "guid": "{b453ae62-4e3d-5e58-b989-0a998ec441b8}",
+                "commandline": "nu.exe",
+                "guid": "{b1bc5929-2f8d-5b56-8c51-3e83379a5b63}",
                 "hidden": false,
-                "name": "Azure Cloud Shell",
-                "source": "Windows.Terminal.Azure"
+                "name": "nushell"
             },
             {
-                "guid": "{2ddc9f1a-8263-557a-8652-3db9e80a7164}",
+                "commandline": "nu.exe",
+                "font": 
+                {
+                    "face": "CaskaydiaCove Nerd Font"
+                },
+                "guid": "{4b9d9cef-cb7d-4a8c-8b08-0de52621c3ff}",
+                "hidden": false,
+                "name": "nushell2"
+            },
+            {
+                "guid": "{d687724c-5ffe-5f70-9d5c-42071d2777f6}",
                 "hidden": false,
                 "name": "Developer Command Prompt for VS 2022",
                 "source": "Windows.Terminal.VisualStudio"
@@ -145,6 +142,18 @@
                 "hidden": false,
                 "name": "Ubuntu-24.04",
                 "source": "Microsoft.WSL"
+            },
+            {
+                "guid": "{cbea17b6-52dc-59c9-9e41-3b451bbf1ea5}",
+                "hidden": false,
+                "name": "Ubuntu-24.04",
+                "source": "Microsoft.WSL"
+            },
+            {
+                "guid": "{8f066081-a8fb-5509-8e0e-9ec98d4a21b3}",
+                "hidden": false,
+                "name": "Ubuntu-24.04",
+                "source": "Microsoft.WSL"
             }
         ]
     },

machineconfig/settings/shells/zsh/init.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/zsh
 # Record script start time for runtime measurement
 # _START_TIME_NS=$(date +%s%N)
 # _show_elapsed() {
@@ -10,7 +10,7 @@
 #     printf "Script runtime: %d.%03d seconds\n" "$_secs" "$_ms"
 # }
 
-# 🛠️ Bash Shell Configuration and Initialization
+# 🛠️ Zsh Shell Configuration and Initialization
 
 add_to_path_if_not_already() {
     for dir in "$@"; do
@@ -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,31 @@ 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
+# if [ -x "$HOME/.bun/bin/bun" ]; then
+#     alias node='$HOME/.bun/bin/bun'
+# fi
+
 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='. $CONFIG_ROOT/scripts/wrap_mcfg explore'
 
 # alias gcs='gh copilot suggest -t shell'
 # alias gcg='gh copilot suggest -t git'
@@ -67,25 +76,35 @@ alias u=utils
 #   gh copilot explain "Input command is: $x The output is this: $y"
 # }
 
-# 📦 Node Version Manager
-# export NVM_DIR="$HOME/.nvm"
-# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
 
 # https://github.com/atuinsh/atuin
 # eval "$(atuin init bash)"
-
 # source /home/alex/.config/broot/launcher/bash/br
 # eval "$(thefuck --alias)"
 # from https://github.com/ajeetdsouza/zoxide
 eval "$(zoxide init zsh)"
 # from https://github.com/starship/starship
 eval "$(starship init zsh)"
-# LEVE THIS IN THE END TO AVOID EXECUTION FAILURE OF THE REST OF THE SCRIPT
-# from https://github.com/cantino/mcfly
-eval "$(mcfly init zsh)"
 
-# Show elapsed runtime
-# _show_elapsed
+# LEVE THIS IN THE END TO AVOID EXECUTION FAILURE OF THE REST OF THE SCRIPT
+if command -v mcfly &> /dev/null; then
+    eval "$(mcfly init zsh)"
+elif command -v atuin &> /dev/null; then
+    eval "$(atuin init zsh)"
+else
+    tv_shell_history() {
+        local current_prompt="$LBUFFER"
+        local output
+        printf "\n"
+        output=$(tv zsh-history --input "$current_prompt" --inline)
+        if [[ -n "$output" ]]; then
+            BUFFER="$output"
+            CURSOR=${#BUFFER}
+        fi
+        printf "\033[A"
+        zle reset-prompt
+    }
+    zle -N tv_shell_history
+    bindkey '^R' tv_shell_history
+fi
 

machineconfig/settings/television/cable_unix/alias.toml

@@ -0,0 +1,8 @@
+[metadata]
+name = "alias"
+description = "A channel to select from shell aliases"
+
+[source]
+# you may need to adjust the command depending on your shell
+command = "$SHELL -ic 'alias'"
+output = "{split:=:0}"

machineconfig/settings/television/cable_unix/aws-buckets.toml

@@ -0,0 +1,14 @@
+[metadata]
+name = "aws-buckets"
+description = "List and preview AWS S3 Buckets"
+requirements = ["aws"]
+
+[source]
+command = "aws s3 ls --output text"
+output = "{split: :3|trim}"
+
+[preview]
+command = "aws s3 ls s3://{split: :3|trim} --human-readable --summarize"
+
+[ui.preview_panel]
+size = 60

machineconfig/settings/television/cable_unix/aws-instances.toml

@@ -0,0 +1,13 @@
+[metadata]
+name = "aws-instances"
+description = "List and preview AWS EC2 Instances"
+requirements = ["aws"]
+
+[source]
+command = "aws ec2 describe-instances --output text --query \"Reservations[*].Instances[*].[InstanceId,Tags[?Key=='Name']|[0].Value]\""
+
+[preview]
+command = "aws ec2 describe-instances --output json --instance-ids {split:\t:0} --query 'Reservations[*].Instances[0]'"
+
+[ui.preview_panel]
+size = 60

machineconfig/settings/television/cable_unix/bash-history.toml

@@ -0,0 +1,8 @@
+# UNTESTED
+[metadata]
+name = "bash-history"
+description = "A channel to select from your bash history"
+requirements = ["bash"]
+
+[source]
+command = "awk 'NF { lines[NR] = $0 } END { for (i = NR; i >= 1; i--) { line = lines[i]; if (!(line in seen)) { seen[line] = 1; print line } } }' ${HISTFILE:-${HOME}/.bash_history}"

machineconfig/settings/television/cable_unix/channels.toml

@@ -0,0 +1,19 @@
+[metadata]
+name = "channels"
+description = "Select a television channel"
+requirements = ["tv", "bat"]
+
+[source]
+command = ["tv list-channels"]
+
+[preview]
+command = "bat -pn --color always ${XDG_CONFIG_HOME:-$HOME/.config}/television/cable/{}.toml"
+
+[keybindings]
+enter = "actions:channel-enter"
+
+[actions.channel-enter]
+description = "Enter a television channel"
+command = "tv {}"
+mode = "execute"
+

machineconfig/settings/television/cable_unix/dirs.toml

@@ -0,0 +1,13 @@
+[metadata]
+name = "dirs"
+description = "A channel to select from directories"
+requirements = ["fd"]
+
+[source]
+command = ["fd -t d", "fd -t d --hidden"]
+
+[preview]
+command = "ls -la --color=always '{}'"
+
+[keybindings]
+shortcut = "f2"

machineconfig/settings/television/cable_unix/distrobox-list.toml

@@ -0,0 +1,42 @@
+[metadata]
+name = "distrobox-list"
+description = "A channel to select a container from distrobox"
+requirements = ["distrobox", "bat"]
+
+[source]
+command = ["distrobox list | awk -F '|' '{ gsub(/ /, \"\", $2); print $2}' | tail --lines=+2"]
+
+[preview]
+command = "(distrobox list | column -t -s '|' | awk -v selected_name={} 'NR==1 || $0 ~ selected_name') && echo && distrobox enter -d {} | bat --plain --color=always -lbash"
+
+[keybindings]
+ctrl-e = "actions:distrobox-enter"
+ctrl-l = "actions:distrobox-list"
+ctrl-r = "actions:distrobox-rm"
+ctrl-s = "actions:distrobox-stop"
+ctrl-u = "actions:distrobox-upgrade"
+
+[actions.distrobox-enter]
+description = "Enter a distrobox"
+command = "distrobox enter {}"
+mode = "execute"
+
+[actions.distrobox-list]
+description = "List a distrobox"
+command = "distrobox list | column -t -s '|' | awk -v selected_name={} 'NR==1 || $0 ~ selected_name'"
+mode = "execute"
+
+[actions.distrobox-rm]
+description = "Remove a distrobox"
+command = "distrobox rm {}"
+mode = "execute"
+
+[actions.distrobox-stop]
+description = "Stop a distrobox"
+command = "distrobox stop {}"
+mode = "execute"
+
+[actions.distrobox-upgrade]
+description = "Upgrade a distrobox"
+command = "distrobox upgrade {}"
+mode = "execute"

machineconfig/settings/television/cable_unix/docker-images.toml

@@ -0,0 +1,13 @@
+# UNTESTED
+[metadata]
+name = "docker-images"
+description = "A channel to select from Docker images"
+requirements = ["docker", "jq"]
+
+[source]
+command = "docker images --format '{{.Repository}}:{{.Tag}} {{.ID}}'"
+output = "{split: :-1}"
+
+
+[preview]
+command = "docker image inspect '{split: :-1}' | jq -C"

machineconfig/settings/television/cable_unix/dotfiles.toml

@@ -0,0 +1,11 @@
+[metadata]
+name = "dotfiles"
+description = "A channel to select from your user's dotfiles"
+requirements = ["fd", "bat"]
+
+[source]
+command = "fd -t f . $HOME/.config"
+
+
+[preview]
+command = "bat -n --color=always '{}'"

machineconfig/settings/television/cable_unix/env.toml

@@ -0,0 +1,17 @@
+[metadata]
+name = "env"
+description = "A channel to select from environment variables"
+
+[source]
+command = "printenv"
+output = "{split:=:1..}" # output the value
+
+[preview]
+command = "echo '{split:=:1..}'"
+
+[ui]
+layout = "portrait"
+preview_panel = { size = 20, header = "{split:=:0}" }
+
+[keybindings]
+shortcut = "f3"

machineconfig/settings/television/cable_unix/files.toml

@@ -0,0 +1,11 @@
+[metadata]
+name = "files"
+description = "A channel to search through files and directories"
+requirements = ["fd", "bat"]
+
+[source]
+command = "fd -t f"
+
+[preview]
+command = "bat -n --color=always '{}'"
+env = { BAT_THEME = "Catppuccin Mocha" }

machineconfig/settings/television/cable_unix/fish-history.toml

@@ -0,0 +1,8 @@
+# UNTESTED
+[metadata]
+name = "fish-history"
+description = "A channel to select from your fish history"
+requirements = ["fish"]
+
+[source]
+command = "fish -c 'history'"

machineconfig/settings/television/cable_unix/git-branch.toml

@@ -0,0 +1,11 @@
+[metadata]
+name = "git-branch"
+description = "A channel to select from git branches"
+requirements = ["git"]
+
+[source]
+command = "git --no-pager branch --all --format=\"%(refname:short)\""
+output = "{split: :0}"
+
+[preview]
+command = "git show -p --stat --pretty=fuller --color=always '{0}'"