1
0
Fork 0

zsh: fix syntax highlight in editors, create grc functions only when they will work

This commit is contained in:
Von Random 2025-10-16 19:56:23 +03:00
parent 8e6ffd5b26
commit 4968bf18ac

View file

@ -9,34 +9,34 @@ function addpath {
fi fi
} }
function testbin { whence $@ > /dev/null } function testbin { whence $@ > /dev/null; }
function cm { command chezmoi $@ } function cm { command chezmoi $@; }
function diff { command diff --color $@ } function diff { command diff --color $@; }
function tailf { command less +F $@ } function tailf { command less +F $@; }
function grep { command grep --color=auto $@ } function grep { command grep --color=auto $@; }
function rgrep { grep --exclude-dir=.git -R $@ } function rgrep { grep --exclude-dir=.git -R $@; }
function zj { command zellij $@ } function zj { command zellij $@; }
function tmux { command tmux -2 $@ } function tmux { command tmux -2 $@; }
function atmux { tmux attach || tmux } function atmux { tmux attach || tmux; }
function ksw { command kubecm switch $@ } function ksw { command kubecm switch $@; }
function k { command kubectl $@ } function k { command kubectl $@; }
function kg { command kubectl get $@ } function kg { command kubectl get $@; }
function kc { command kubectl config $@ } function kc { command kubectl config $@; }
function kshell { command kubectl exec -n $1 --stdin --tty $2 -- /bin/sh } function kshell { command kubectl exec -n $1 --stdin --tty $2 -- /bin/sh; }
function g { command lazygit $@ } function g { command lazygit $@; }
function gci { command git commit $@ } function gci { command git commit $@; }
function gsl { command git stash list $@ } function gsl { command git stash list $@; }
function gss { command git status -sbu $@ } function gss { command git status -sbu $@; }
function gsw { command git switch $@ } function gsw { command git switch $@; }
function gup { command git pull $@ } function gup { command git pull $@; }
function gwta { command git worktree add $@ } function gwta { command git worktree add $@; }
function gwtp { command git worktree prune -v } function gwtp { command git worktree prune -v; }
function groot { cd $(command git rev-parse --show-toplevel) || return 0 } function groot { cd $(command git rev-parse --show-toplevel) || return 0; }
function gdiff { command git diff --color $@ } function gdiff { command git diff --color $@; }
function greset { function greset {
echo "OK to reset and clean teh repo?" echo "OK to reset and clean teh repo?"
read -sq _ read -sq _
@ -46,19 +46,19 @@ function greset {
} }
if testbin diff-so-fancy; then if testbin diff-so-fancy; then
function gdf { gdiff $@ | command diff-so-fancy | command less --tabs=4 -RSFX } function gdf { gdiff $@ | command diff-so-fancy | command less --tabs=4 -RSFX; }
else else
function gdf { gdiff $@ } function gdf { gdiff $@; }
fi fi
if testbin eza; then if testbin eza; then
function ls { command eza --icons --group-directories-first $@ } function ls { command eza --icons --group-directories-first $@; }
function ll { ls -alg $@ } function ll { ls -alg $@; }
function ld { ls -dlg $@ } function ld { ls -dlg $@; }
else else
function ls { command ls --color=auto --group-directories-first $@ } function ls { command ls --color=auto --group-directories-first $@; }
function ll { ls -alh $@ } function ll { ls -alh $@; }
function ld { ls -dlh $@ } function ld { ls -dlh $@; }
fi fi
# grc # grc
@ -73,7 +73,7 @@ if testbin grc; then
dig diff df blkid dig diff df blkid
) )
for cmd in $cmds; do for cmd in $cmds; do
eval "function $cmd { command grc -es --colour=auto $cmd \$@ }" testbin $cmd && eval "function $cmd { command grc -es --colour=auto $cmd \$@; }"
done done
unset cmds cmd unset cmds cmd
fi fi