1
0
mirror of https://github.com/DazAh/dotfiles synced 2026-05-22 02:25:48 +01:00

Upgrade Oh-my-zsh

This commit is contained in:
DazAh
2020-04-19 09:38:02 +01:00
parent b00fd49b00
commit c6ab2bc336
184 changed files with 7108 additions and 4519 deletions
@@ -9,33 +9,34 @@
export MARKPATH=$HOME/.marks
jump() {
cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
builtin cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
}
mark() {
if [[ ( $# == 0 ) || ( "$1" == "." ) ]]; then
MARK=$(basename "$PWD")
if [[ $# -eq 0 || "$1" = "." ]]; then
MARK=${PWD:t}
else
MARK="$1"
fi
if read -q \?"Mark $PWD as ${MARK}? (y/n) "; then
mkdir -p "$MARKPATH"; ln -sfn "$PWD" "$MARKPATH/$MARK"
if read -q "?Mark $PWD as ${MARK}? (y/n) "; then
command mkdir -p "$MARKPATH"
command ln -sfn "$PWD" "$MARKPATH/$MARK"
fi
}
unmark() {
rm -i "$MARKPATH/$1"
LANG= command rm -i "$MARKPATH/$1"
}
marks() {
local max=0
for link in $MARKPATH/*(@); do
local link max=0
for link in $MARKPATH/{,.}*(@N); do
if [[ ${#link:t} -gt $max ]]; then
max=${#link:t}
fi
done
local printf_markname_template="$(printf -- "%%%us " "$max")"
for link in $MARKPATH/*(@); do
for link in $MARKPATH/{,.}*(@N); do
local markname="$fg[cyan]${link:t}$reset_color"
local markpath="$fg[blue]$(readlink $link)$reset_color"
printf -- "$printf_markname_template" "$markname"
@@ -44,21 +45,15 @@ marks() {
}
_completemarks() {
if [[ $(ls "${MARKPATH}" | wc -l) -gt 1 ]]; then
reply=($(ls $MARKPATH/**/*(-) | grep : | sed -E 's/(.*)\/([_a-zA-Z0-9\.\-]*):$/\2/g'))
else
if readlink -e "${MARKPATH}"/* &>/dev/null; then
reply=($(ls "${MARKPATH}"))
fi
fi
reply=("${MARKPATH}"/{,.}*(@N:t))
}
compctl -K _completemarks jump
compctl -K _completemarks unmark
_mark_expansion() {
setopt extendedglob
setopt localoptions extendedglob
autoload -U modify-current-argument
modify-current-argument '$(readlink "$MARKPATH/$ARG")'
modify-current-argument '$(readlink "$MARKPATH/$ARG" || echo "$ARG")'
}
zle -N _mark_expansion
bindkey "^g" _mark_expansion