mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-03-12 11:03:45 +00:00
chore(config): update oh-my-posh cfg, completions
This commit is contained in:
@@ -1,121 +1,116 @@
|
|||||||
"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
|
"$schema" = "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json"
|
||||||
final_space = true
|
console_title_template = '{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}'
|
||||||
console_title_template = "{{.UserName}}@{{.HostName}} {{.Shell}} in {{.PWD}}"
|
version = 3
|
||||||
version = 2
|
|
||||||
auto_upgrade = true
|
auto_upgrade = true
|
||||||
|
final_space = true
|
||||||
[[blocks]]
|
|
||||||
alignment = "left"
|
|
||||||
type = "prompt"
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
foreground = "cyan"
|
|
||||||
style = "powerline"
|
|
||||||
template = "{{ .Icon }}"
|
|
||||||
type = "os"
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
type = "session"
|
|
||||||
style = "plain"
|
|
||||||
template = " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
foreground = "cyan"
|
|
||||||
style = "plain"
|
|
||||||
template = " {{ .Path }} "
|
|
||||||
type = "path"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
style = "mixed"
|
|
||||||
|
|
||||||
[blocks.segments.mapped_locations]
|
|
||||||
"~/Code/*" = ""
|
|
||||||
"~/Code/ivuorinen/" = ""
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
type = "git"
|
|
||||||
style = "plain"
|
|
||||||
foreground = "lightGreen"
|
|
||||||
template = "{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }}"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
fetch_status = true
|
|
||||||
fetch_upstream_icon = true
|
|
||||||
|
|
||||||
[blocks.segments.properties.untracked_modes]
|
|
||||||
"~/Code/oh-my-posh/" = "no"
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
type = "terraform"
|
|
||||||
style = "plain"
|
|
||||||
foreground = "#000000"
|
|
||||||
background = "#ebcc34"
|
|
||||||
template = "{{.WorkspaceName}}"
|
|
||||||
|
|
||||||
[[blocks]]
|
|
||||||
alignment = "left"
|
|
||||||
type = "prompt"
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
foreground = "#68a063"
|
|
||||||
style = "plain"
|
|
||||||
template = " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}"
|
|
||||||
type = "node"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
display_mode = "files"
|
|
||||||
fetch_package_manager = true
|
|
||||||
fetch_version = true
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
foreground = "#4063D8"
|
|
||||||
style = "plain"
|
|
||||||
template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
|
|
||||||
type = "crystal"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
display_mode = "files"
|
|
||||||
fetch_version = true
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
foreground = "#DE3F24"
|
|
||||||
style = "plain"
|
|
||||||
template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
|
|
||||||
type = "ruby"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
display_mode = "files"
|
|
||||||
fetch_version = true
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
foreground = "#FED142"
|
|
||||||
style = "plain"
|
|
||||||
template = " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}"
|
|
||||||
type = "python"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
display_mode = "context"
|
|
||||||
fetch_virtual_env = false
|
|
||||||
|
|
||||||
[[blocks]]
|
|
||||||
alignment = "left"
|
|
||||||
newline = true
|
|
||||||
type = "prompt"
|
|
||||||
|
|
||||||
[[blocks.segments]]
|
|
||||||
background = "transparent"
|
|
||||||
foreground = "lightGreen"
|
|
||||||
foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
|
|
||||||
style = "plain"
|
|
||||||
template = "➜"
|
|
||||||
type = "status"
|
|
||||||
|
|
||||||
[blocks.segments.properties]
|
|
||||||
always_enabled = true
|
|
||||||
|
|
||||||
[transient_prompt]
|
[transient_prompt]
|
||||||
background = "transparent"
|
template = '➜ '
|
||||||
foreground = "lightGreen"
|
foreground = 'lightGreen'
|
||||||
foreground_templates = [ "{{ if gt .Code 0 }}red{{ end }}" ]
|
background = 'transparent'
|
||||||
template = "➜ "
|
foreground_templates = ['{{ if gt .Code 0 }}red{{ end }}']
|
||||||
|
|
||||||
|
[[blocks]]
|
||||||
|
type = 'prompt'
|
||||||
|
alignment = 'left'
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'powerline'
|
||||||
|
template = '{{ .Icon }}'
|
||||||
|
foreground = 'cyan'
|
||||||
|
type = 'os'
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = ' {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}'
|
||||||
|
type = 'session'
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = ' {{ .Path }} '
|
||||||
|
foreground = 'cyan'
|
||||||
|
type = 'path'
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
style = 'mixed'
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = '{{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} {{ .StashCount }}{{ end }}'
|
||||||
|
foreground = 'lightGreen'
|
||||||
|
type = 'git'
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
fetch_status = true
|
||||||
|
fetch_upstream_icon = true
|
||||||
|
|
||||||
|
[blocks.segments.properties.untracked_modes]
|
||||||
|
'~/Code/oh-my-posh/' = 'no'
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = '{{.WorkspaceName}}'
|
||||||
|
foreground = '#000000'
|
||||||
|
background = '#ebcc34'
|
||||||
|
type = 'terraform'
|
||||||
|
|
||||||
|
[[blocks]]
|
||||||
|
type = 'prompt'
|
||||||
|
alignment = 'left'
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = ' {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}'
|
||||||
|
foreground = '#68a063'
|
||||||
|
type = 'node'
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
display_mode = 'files'
|
||||||
|
fetch_package_manager = true
|
||||||
|
fetch_version = true
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = ' {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}'
|
||||||
|
foreground = '#4063D8'
|
||||||
|
type = 'crystal'
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
display_mode = 'files'
|
||||||
|
fetch_version = true
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = ' {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}'
|
||||||
|
foreground = '#DE3F24'
|
||||||
|
type = 'ruby'
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
display_mode = 'files'
|
||||||
|
fetch_version = true
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = ' {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}'
|
||||||
|
foreground = '#FED142'
|
||||||
|
type = 'python'
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
display_mode = 'context'
|
||||||
|
fetch_virtual_env = false
|
||||||
|
|
||||||
|
[[blocks]]
|
||||||
|
type = 'prompt'
|
||||||
|
alignment = 'left'
|
||||||
|
newline = true
|
||||||
|
|
||||||
|
[[blocks.segments]]
|
||||||
|
style = 'plain'
|
||||||
|
template = '➜'
|
||||||
|
foreground = 'lightGreen'
|
||||||
|
background = 'transparent'
|
||||||
|
type = 'status'
|
||||||
|
foreground_templates = ['{{ if gt .Code 0 }}red{{ end }}']
|
||||||
|
|
||||||
|
[blocks.segments.properties]
|
||||||
|
always_enabled = true
|
||||||
|
|||||||
212
config/zsh/completion/_oh-my-posh
Normal file
212
config/zsh/completion/_oh-my-posh
Normal file
@@ -0,0 +1,212 @@
|
|||||||
|
#compdef oh-my-posh
|
||||||
|
compdef _oh-my-posh oh-my-posh
|
||||||
|
|
||||||
|
# zsh completion for oh-my-posh -*- shell-script -*-
|
||||||
|
|
||||||
|
__oh-my-posh_debug()
|
||||||
|
{
|
||||||
|
local file="$BASH_COMP_DEBUG_FILE"
|
||||||
|
if [[ -n ${file} ]]; then
|
||||||
|
echo "$*" >> "${file}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_oh-my-posh()
|
||||||
|
{
|
||||||
|
local shellCompDirectiveError=1
|
||||||
|
local shellCompDirectiveNoSpace=2
|
||||||
|
local shellCompDirectiveNoFileComp=4
|
||||||
|
local shellCompDirectiveFilterFileExt=8
|
||||||
|
local shellCompDirectiveFilterDirs=16
|
||||||
|
local shellCompDirectiveKeepOrder=32
|
||||||
|
|
||||||
|
local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder
|
||||||
|
local -a completions
|
||||||
|
|
||||||
|
__oh-my-posh_debug "\n========= starting completion logic =========="
|
||||||
|
__oh-my-posh_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
|
||||||
|
|
||||||
|
# The user could have moved the cursor backwards on the command-line.
|
||||||
|
# We need to trigger completion from the $CURRENT location, so we need
|
||||||
|
# to truncate the command-line ($words) up to the $CURRENT location.
|
||||||
|
# (We cannot use $CURSOR as its value does not work when a command is an alias.)
|
||||||
|
words=("${=words[1,CURRENT]}")
|
||||||
|
__oh-my-posh_debug "Truncated words[*]: ${words[*]},"
|
||||||
|
|
||||||
|
lastParam=${words[-1]}
|
||||||
|
lastChar=${lastParam[-1]}
|
||||||
|
__oh-my-posh_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
|
||||||
|
|
||||||
|
# For zsh, when completing a flag with an = (e.g., oh-my-posh -n=<TAB>)
|
||||||
|
# completions must be prefixed with the flag
|
||||||
|
setopt local_options BASH_REMATCH
|
||||||
|
if [[ "${lastParam}" =~ '-.*=' ]]; then
|
||||||
|
# We are dealing with a flag with an =
|
||||||
|
flagPrefix="-P ${BASH_REMATCH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Prepare the command to obtain completions
|
||||||
|
requestComp="${words[1]} __complete ${words[2,-1]}"
|
||||||
|
if [ "${lastChar}" = "" ]; then
|
||||||
|
# If the last parameter is complete (there is a space following it)
|
||||||
|
# We add an extra empty parameter so we can indicate this to the go completion code.
|
||||||
|
__oh-my-posh_debug "Adding extra empty parameter"
|
||||||
|
requestComp="${requestComp} \"\""
|
||||||
|
fi
|
||||||
|
|
||||||
|
__oh-my-posh_debug "About to call: eval ${requestComp}"
|
||||||
|
|
||||||
|
# Use eval to handle any environment variables and such
|
||||||
|
out=$(eval ${requestComp} 2>/dev/null)
|
||||||
|
__oh-my-posh_debug "completion output: ${out}"
|
||||||
|
|
||||||
|
# Extract the directive integer following a : from the last line
|
||||||
|
local lastLine
|
||||||
|
while IFS='\n' read -r line; do
|
||||||
|
lastLine=${line}
|
||||||
|
done < <(printf "%s\n" "${out[@]}")
|
||||||
|
__oh-my-posh_debug "last line: ${lastLine}"
|
||||||
|
|
||||||
|
if [ "${lastLine[1]}" = : ]; then
|
||||||
|
directive=${lastLine[2,-1]}
|
||||||
|
# Remove the directive including the : and the newline
|
||||||
|
local suffix
|
||||||
|
(( suffix=${#lastLine}+2))
|
||||||
|
out=${out[1,-$suffix]}
|
||||||
|
else
|
||||||
|
# There is no directive specified. Leave $out as is.
|
||||||
|
__oh-my-posh_debug "No directive found. Setting do default"
|
||||||
|
directive=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
__oh-my-posh_debug "directive: ${directive}"
|
||||||
|
__oh-my-posh_debug "completions: ${out}"
|
||||||
|
__oh-my-posh_debug "flagPrefix: ${flagPrefix}"
|
||||||
|
|
||||||
|
if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
|
||||||
|
__oh-my-posh_debug "Completion received error. Ignoring completions."
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
local activeHelpMarker="_activeHelp_ "
|
||||||
|
local endIndex=${#activeHelpMarker}
|
||||||
|
local startIndex=$((${#activeHelpMarker}+1))
|
||||||
|
local hasActiveHelp=0
|
||||||
|
while IFS='\n' read -r comp; do
|
||||||
|
# Check if this is an activeHelp statement (i.e., prefixed with $activeHelpMarker)
|
||||||
|
if [ "${comp[1,$endIndex]}" = "$activeHelpMarker" ];then
|
||||||
|
__oh-my-posh_debug "ActiveHelp found: $comp"
|
||||||
|
comp="${comp[$startIndex,-1]}"
|
||||||
|
if [ -n "$comp" ]; then
|
||||||
|
compadd -x "${comp}"
|
||||||
|
__oh-my-posh_debug "ActiveHelp will need delimiter"
|
||||||
|
hasActiveHelp=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$comp" ]; then
|
||||||
|
# If requested, completions are returned with a description.
|
||||||
|
# The description is preceded by a TAB character.
|
||||||
|
# For zsh's _describe, we need to use a : instead of a TAB.
|
||||||
|
# We first need to escape any : as part of the completion itself.
|
||||||
|
comp=${comp//:/\\:}
|
||||||
|
|
||||||
|
local tab="$(printf '\t')"
|
||||||
|
comp=${comp//$tab/:}
|
||||||
|
|
||||||
|
__oh-my-posh_debug "Adding completion: ${comp}"
|
||||||
|
completions+=${comp}
|
||||||
|
lastComp=$comp
|
||||||
|
fi
|
||||||
|
done < <(printf "%s\n" "${out[@]}")
|
||||||
|
|
||||||
|
# Add a delimiter after the activeHelp statements, but only if:
|
||||||
|
# - there are completions following the activeHelp statements, or
|
||||||
|
# - file completion will be performed (so there will be choices after the activeHelp)
|
||||||
|
if [ $hasActiveHelp -eq 1 ]; then
|
||||||
|
if [ ${#completions} -ne 0 ] || [ $((directive & shellCompDirectiveNoFileComp)) -eq 0 ]; then
|
||||||
|
__oh-my-posh_debug "Adding activeHelp delimiter"
|
||||||
|
compadd -x "--"
|
||||||
|
hasActiveHelp=0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
|
||||||
|
__oh-my-posh_debug "Activating nospace."
|
||||||
|
noSpace="-S ''"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $((directive & shellCompDirectiveKeepOrder)) -ne 0 ]; then
|
||||||
|
__oh-my-posh_debug "Activating keep order."
|
||||||
|
keepOrder="-V"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
|
||||||
|
# File extension filtering
|
||||||
|
local filteringCmd
|
||||||
|
filteringCmd='_files'
|
||||||
|
for filter in ${completions[@]}; do
|
||||||
|
if [ ${filter[1]} != '*' ]; then
|
||||||
|
# zsh requires a glob pattern to do file filtering
|
||||||
|
filter="\*.$filter"
|
||||||
|
fi
|
||||||
|
filteringCmd+=" -g $filter"
|
||||||
|
done
|
||||||
|
filteringCmd+=" ${flagPrefix}"
|
||||||
|
|
||||||
|
__oh-my-posh_debug "File filtering command: $filteringCmd"
|
||||||
|
_arguments '*:filename:'"$filteringCmd"
|
||||||
|
elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
|
||||||
|
# File completion for directories only
|
||||||
|
local subdir
|
||||||
|
subdir="${completions[1]}"
|
||||||
|
if [ -n "$subdir" ]; then
|
||||||
|
__oh-my-posh_debug "Listing directories in $subdir"
|
||||||
|
pushd "${subdir}" >/dev/null 2>&1
|
||||||
|
else
|
||||||
|
__oh-my-posh_debug "Listing directories in ."
|
||||||
|
fi
|
||||||
|
|
||||||
|
local result
|
||||||
|
_arguments '*:dirname:_files -/'" ${flagPrefix}"
|
||||||
|
result=$?
|
||||||
|
if [ -n "$subdir" ]; then
|
||||||
|
popd >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
return $result
|
||||||
|
else
|
||||||
|
__oh-my-posh_debug "Calling _describe"
|
||||||
|
if eval _describe $keepOrder "completions" completions $flagPrefix $noSpace; then
|
||||||
|
__oh-my-posh_debug "_describe found some completions"
|
||||||
|
|
||||||
|
# Return the success of having called _describe
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
__oh-my-posh_debug "_describe did not find completions."
|
||||||
|
__oh-my-posh_debug "Checking if we should do file completion."
|
||||||
|
if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
|
||||||
|
__oh-my-posh_debug "deactivating file completion"
|
||||||
|
|
||||||
|
# We must return an error code here to let zsh know that there were no
|
||||||
|
# completions found by _describe; this is what will trigger other
|
||||||
|
# matching algorithms to attempt to find completions.
|
||||||
|
# For example zsh can match letters in the middle of words.
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
# Perform file completion
|
||||||
|
__oh-my-posh_debug "Activating file completion"
|
||||||
|
|
||||||
|
# We must return the result of this command, so it must be the
|
||||||
|
# last command, or else we must store its result to return it.
|
||||||
|
_arguments '*:filename:_files'" ${flagPrefix}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# don't run the completion function when being source-ed or eval-ed
|
||||||
|
if [ "$funcstack[1]" = "_oh-my-posh" ]; then
|
||||||
|
_oh-my-posh
|
||||||
|
fi
|
||||||
Reference in New Issue
Block a user