sync

3 files changed, 261 insertions, 30 deletions

diff --git a/zsh/.config/zsh/comp/devpod.zsh-completion b/zsh/.config/zsh/comp/devpod.zsh-completion
new file mode 100644
index 0000000..5dcdab0
--- /dev/null
+++ b/zsh/.config/zsh/comp/devpod.zsh-completion
@@ -0,0 +1,212 @@
+#compdef devpod
+compdef _devpod devpod
+
+# zsh completion for devpod                               -*- shell-script -*-
+
+__devpod_debug()
+{
+    local file="$BASH_COMP_DEBUG_FILE"
+    if [[ -n ${file} ]]; then
+        echo "$*" >> "${file}"
+    fi
+}
+
+_devpod()
+{
+    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
+
+    __devpod_debug "\n========= starting completion logic =========="
+    __devpod_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]}")
+    __devpod_debug "Truncated words[*]: ${words[*]},"
+
+    lastParam=${words[-1]}
+    lastChar=${lastParam[-1]}
+    __devpod_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+    # For zsh, when completing a flag with an = (e.g., devpod -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.
+        __devpod_debug "Adding extra empty parameter"
+        requestComp="${requestComp} \"\""
+    fi
+
+    __devpod_debug "About to call: eval ${requestComp}"
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+    __devpod_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[@]}")
+    __devpod_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.
+        __devpod_debug "No directive found.  Setting do default"
+        directive=0
+    fi
+
+    __devpod_debug "directive: ${directive}"
+    __devpod_debug "completions: ${out}"
+    __devpod_debug "flagPrefix: ${flagPrefix}"
+
+    if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+        __devpod_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
+            __devpod_debug "ActiveHelp found: $comp"
+            comp="${comp[$startIndex,-1]}"
+            if [ -n "$comp" ]; then
+                compadd -x "${comp}"
+                __devpod_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/:}
+
+            __devpod_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
+            __devpod_debug "Adding activeHelp delimiter"
+            compadd -x "--"
+            hasActiveHelp=0
+        fi
+    fi
+
+    if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+        __devpod_debug "Activating nospace."
+        noSpace="-S ''"
+    fi
+
+    if [ $((directive & shellCompDirectiveKeepOrder)) -ne 0 ]; then
+        __devpod_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}"
+
+        __devpod_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
+            __devpod_debug "Listing directories in $subdir"
+            pushd "${subdir}" >/dev/null 2>&1
+        else
+            __devpod_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
+        __devpod_debug "Calling _describe"
+        if eval _describe $keepOrder "completions" completions $flagPrefix $noSpace; then
+            __devpod_debug "_describe found some completions"
+
+            # Return the success of having called _describe
+            return 0
+        else
+            __devpod_debug "_describe did not find completions."
+            __devpod_debug "Checking if we should do file completion."
+            if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+                __devpod_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
+                __devpod_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]" = "_devpod" ]; then
+    _devpod
+fi
diff --git a/zsh/.config/zsh/theme/internal/parser.zsh.zwc b/zsh/.config/zsh/theme/internal/parser.zsh.zwc
index 19d5d73..8312712 100644
--- a/zsh/.config/zsh/theme/internal/parser.zsh.zwc
+++ b/zsh/.config/zsh/theme/internal/parser.zsh.zwc
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 07065c3..4805208 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,48 +1,35 @@
 source ~/.config/zsh/antigen.zsh
-
-# if command -v git >/dev/null && [ ! -d ~/.config/zsh/powerlevel10k ]; then
-# 	echo "info: installing p10k"
-# 	git clone --depth 1 --single-branch https://github.com/romkatv/powerlevel10k.git ~/.config/zsh/powerlevel10k
-# fi
-#
-if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-	source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
-
-source ~/.config/zsh/theme/powerlevel10k.zsh-theme
 source ~/.config/zsh/conf.d/*.zsh
 source ~/.config/zsh/termsupport.zsh
 source ~/.config/zsh/title.zsh
-foreground () { fg }
-zle -N foreground
-clearscr () { clear }
-zle -N clearscr
-
-antigen bundle zsh-users/zsh-syntax-highlighting
-antigen bundle zsh-users/zsh-history-substring-search
-antigen bundle zsh-users/zsh-autosuggestions
-antigen bundle zsh-users/zsh-completions
-antigen bundle ael-code/zsh-colored-man-pages
-antigen apply
 
 # {{{ Exports
-#export GOPROXY=https://proxy.neonxp.ru
+export GOPROXY=https://goproxy.ru,direct
+export GONOPROXY=*.sovcombank.group
+export GOSUMDB=off
 export GOPRIVATE=devopar.hippoparking.ru,gitlab.sovcombank.group
 export EDITOR="nvim"
 #export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock
-export ANDROID_HOME=$HOME/projects/android/
+export ANDROID_HOME=$HOME/Android/Sdk
 export PATH=$PATH:$ANDROID_HOME/emulator
 export PATH=$PATH:$ANDROID_HOME/platform-tools
-export PATH=$PATH:~/.local/bin:~/go/bin:~/.cargo/bin
-export GOBIN=~/go/bin
+export GOPATH=~/go
+export PATH=$PATH:~/.local/bin:$GOPATH/bin #:~/.cargo/bin:~/.config/v-analyzer/bin:~/projects/tinygo/bin
+export GOBIN=$GOPATH/bin
 export GPG_TTY=$(tty)
 export LS_OPTIONS='--color=auto'
-export ZK_NOTEBOOK_DIR=$HOME/Документы/notebook/
+
 eval "$(dircolors -b)"
 
-fpath+="~/.config/zsh/comp"
 # }}}
 
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen bundle zsh-users/zsh-history-substring-search
+antigen bundle zsh-users/zsh-autosuggestions
+antigen bundle zsh-users/zsh-completions
+antigen bundle ael-code/zsh-colored-man-pages
+antigen apply
+
 # {{{ Aliases
 alias ls='ls $LS_OPTIONS -F'
 alias l='ls $LS_OPTIONS -F'
@@ -63,12 +50,42 @@ alias g=git
 alias share='wl-paste | curl -si -d @- https://nixshare.ru/paste/clipboard.txt | grep "location:" | sed -s "s/location: //" | wl-copy'
 alias p=python3
 alias t=todo.sh
+alias ed=gnome-text-editor
 [[ ! -f `which exa` ]] || alias ls="exa" && alias ll="exa -l"
 compdef _todo t
 # }}}
 
 # {{{ Functions
+foreground () { fg }
+zle -N foreground
+clearscr () { clear }
+zle -N clearscr
+
+
 function tk() { mkdir -p $1; cd $1; }
+function powerline_precmd() {
+    PS1="$($GOPATH/bin/powerline-go -hostname-only-if-ssh -cwd-max-depth 1 -cwd-mode dironly  -error $? -jobs ${${(%):%j}:-0})"
+
+    # Uncomment the following line to automatically clear errors after showing
+    # them once. This not only clears the error for powerline-go, but also for
+    # everything else you run in that shell. Don't enable this if you're not
+    # sure this is what you want.
+
+    set "?"
+}
+
+function install_powerline_precmd() {
+  for s in "${precmd_functions[@]}"; do
+    if [ "$s" = "powerline_precmd" ]; then
+      return
+    fi
+  done
+  precmd_functions+=(powerline_precmd)
+}
+
+if [ "$TERM" != "linux" ] && [ -f "$GOPATH/bin/powerline-go" ]; then
+    install_powerline_precmd
+fi
 # }}}
 
 # {{{ Options section
@@ -108,9 +125,12 @@ HISTSIZE=100000
 SAVEHIST=100000
 WORDCHARS=${WORDCHARS//\/[&.;]}
 
+fpath=(~/.config/zsh/comp $fpath)
 autoload -U compinit colors zcalc
 compinit -d
 
+autoload -Uz compinit &&  compinit
+
 autoload -U add-zsh-hook
 add-zsh-hook precmd mzc_termsupport_precmd
 add-zsh-hook preexec mzc_termsupport_preexec
@@ -157,7 +177,7 @@ bindkey "^z" foreground
 bindkey "^ " autosuggest-accept
 
 
-bindkey "^k" clearscr
+bindkey "^K" clearscr
 # }}}
 
 ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD
@@ -166,5 +186,4 @@ ZSH_THEME_TERM_TITLE_IDLE="%n@%m:%~"
 source ~/.config/zsh/theme.zsh
 [[ ! -f env.sh ]] || source ./env.sh
 [[ ! -f ~/.zshrc.local.zsh ]] || source ~/.zshrc.local.zsh
-[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 # }}}