From 5e4504749fca540736622f28f66fea9afc23a5e3 Mon Sep 17 00:00:00 2001 From: Andrea Mistrali Date: Wed, 30 Oct 2024 11:02:28 +0100 Subject: [PATCH] Minimize --- zsh.d/10-environment.zsh | 31 ++++++++++++++++++- ...0-termcolors.zsh => 20-termcolors.zsh.off} | 0 zsh.d/30-aliases.zsh | 7 +++-- zsh.d/30-less.zsh | 30 ------------------ zsh.d/50-functions.zsh | 21 +++++++++++++ zsh.d/{60-hooks.zsh => 60-hooks.zsh.off} | 0 zsh.d/90-plugins.zsh | 5 --- zsh.d/README-local.txt | 8 ----- zsh.d/prompts/pure | 2 +- 9 files changed, 57 insertions(+), 47 deletions(-) rename zsh.d/{20-termcolors.zsh => 20-termcolors.zsh.off} (100%) delete mode 100644 zsh.d/30-less.zsh rename zsh.d/{60-hooks.zsh => 60-hooks.zsh.off} (100%) diff --git a/zsh.d/10-environment.zsh b/zsh.d/10-environment.zsh index d32ee39..e2549f8 100644 --- a/zsh.d/10-environment.zsh +++ b/zsh.d/10-environment.zsh @@ -25,7 +25,36 @@ VISUAL=vim export QUOTING_STYLE=escape +####################################################################################### +# Setup LESS + +## make less colourful +LESS_TERMCAP_mb=$'\E[01;34m' # begin blinking +LESS_TERMCAP_md=$'\E[01;36m' # begin bold +LESS_TERMCAP_me=$'\E[0m' # end mode +LESS_TERMCAP_so=$'\E[01;47;34m' # begin standout-mode - info box +LESS_TERMCAP_se=$'\E[0m' # end standout-mode +LESS_TERMCAP_us=$'\E[04;32m' # begin underline +LESS_TERMCAP_ue=$'\E[0m' # end underline + +LESS="-c -x4 -R -MM -PMFile\:?f%f:STDIN. ?BSize\:?B%B:Unk.?B\:?pb%pb\%:Unk.?B\:%i/%m" +LESSCHARSET=utf-8 +READNULLCMD=/usr/bin/less +PAGER=/usr/bin/less + +export LESS +export PAGER + +local LESSOPEN_SCRIPT=$(whence lesspipe lesspipe.sh) +if [ $LESSOPEN_SCRIPT ]; then + LESSOPEN="|${LESSOPEN_SCRIPT} %s" + LESS_ADVANCED_PREPROCESSOR=1 + + export LESSOPEN + export LESS_ADVANCED_PREPROCESSOR +fi + # Set umask to collaborative mode umask 002 -# vim: set ts=4 sw=4 tw=0 ft=zsh : +# vim: set ts=4 sw=4 tw=0 ft=zsh : diff --git a/zsh.d/20-termcolors.zsh b/zsh.d/20-termcolors.zsh.off similarity index 100% rename from zsh.d/20-termcolors.zsh rename to zsh.d/20-termcolors.zsh.off diff --git a/zsh.d/30-aliases.zsh b/zsh.d/30-aliases.zsh index d4640b0..e7e0dd0 100644 --- a/zsh.d/30-aliases.zsh +++ b/zsh.d/30-aliases.zsh @@ -28,11 +28,14 @@ alias ptr='host -t ptr' alias vi="vim " alias du1="du -h --max-depth=1" -alias psg="ps ax|grep " +# alias psg="ps ax|grep " alias myip="dig +short ANY @resolver1.opendns.com myip.opendns.com" alias delkey="ssh-keygen -R " +alias k=kubectl +alias kk='kubectl konfig merge ~/.kube/configs/* > ~/.kube/config' + # Global Aliases # alias -g G="|grep " @@ -42,4 +45,4 @@ alias -g NO="> /dev/null" alias -g NE="2> /dev/null" alias -g NA="> /dev/null 2>&1" -# vim: set ts=4 sw=4 tw=0 ft=zsh : +# vim: set ts=4 sw=4 tw=0 ft=zsh : diff --git a/zsh.d/30-less.zsh b/zsh.d/30-less.zsh deleted file mode 100644 index b4a9d13..0000000 --- a/zsh.d/30-less.zsh +++ /dev/null @@ -1,30 +0,0 @@ -####################################################################################### -# Setup LESS - -## make less colourful -LESS_TERMCAP_mb=$'\E[01;34m' # begin blinking -LESS_TERMCAP_md=$'\E[01;36m' # begin bold -LESS_TERMCAP_me=$'\E[0m' # end mode -LESS_TERMCAP_so=$'\E[01;47;34m' # begin standout-mode - info box -LESS_TERMCAP_se=$'\E[0m' # end standout-mode -LESS_TERMCAP_us=$'\E[04;32m' # begin underline -LESS_TERMCAP_ue=$'\E[0m' # end underline - -LESS="-c -x4 -R -MM -PMFile\:?f%f:STDIN. ?BSize\:?B%B:Unk.?B\:?pb%pb\%:Unk.?B\:%i/%m" -LESSCHARSET=utf-8 -READNULLCMD=/usr/bin/less -PAGER=/usr/bin/less - -export LESS -export PAGER - -local LESSOPEN_SCRIPT=$(whence lesspipe lesspipe.sh) -if [ $LESSOPEN_SCRIPT ]; then - LESSOPEN="|${LESSOPEN_SCRIPT} %s" - LESS_ADVANCED_PREPROCESSOR=1 - - export LESSOPEN - export LESS_ADVANCED_PREPROCESSOR -fi - -# vim: set ts=4 sw=4 tw=0 ft=zsh : diff --git a/zsh.d/50-functions.zsh b/zsh.d/50-functions.zsh index 38ebc19..7d20c5b 100644 --- a/zsh.d/50-functions.zsh +++ b/zsh.d/50-functions.zsh @@ -18,3 +18,24 @@ autoload -Uz add-zsh-hook # Add async support autoload -Uz async && async + +# Async Git update +autoload -Uz vcs_info + +_vbe_vcs_info_done() { + local stdout=$3 + vcs_info_msg_0_=$stdout + # echo $(date +"%Y-%m-%d %H:%M:%S") $PWD info $vcs_info_msg_0_ $vcs_info_msg_1_ >> ~/vcs.log + zle reset-prompt +} + +_vbe_vcs_precmd() { + # echo $(date +"%Y-%m-%d %H:%M:%S") $PWD pre >> ~/vcs.log + async_flush_jobs vcs_info + async_job vcs_info _vbe_vcs_info $PWD +} + +async_init +async_start_worker vcs_info +async_register_callback vcs_info _vbe_vcs_info_done +add-zsh-hook precmd _vbe_vcs_precmd diff --git a/zsh.d/60-hooks.zsh b/zsh.d/60-hooks.zsh.off similarity index 100% rename from zsh.d/60-hooks.zsh rename to zsh.d/60-hooks.zsh.off diff --git a/zsh.d/90-plugins.zsh b/zsh.d/90-plugins.zsh index ff05eb9..300a1d9 100644 --- a/zsh.d/90-plugins.zsh +++ b/zsh.d/90-plugins.zsh @@ -24,10 +24,5 @@ fi # kubectl/krew export PATH="${KREW_ROOT:-$HOME/.krew}/bin:$PATH" -if type kubectl > /dev/null; then - alias k=kubectl - alias kk='kubectl konfig merge ~/.kube/configs/* > ~/.kube/config' -fi - # Setup iTerm shell integration #test -e $HOME/.iterm2_shell_integration.zsh && source $HOME/.iterm2_shell_integration.zsh && export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=YES || echo "iTerm sh integration not installed" diff --git a/zsh.d/README-local.txt b/zsh.d/README-local.txt index db4d2e6..cdc3f58 100644 --- a/zsh.d/README-local.txt +++ b/zsh.d/README-local.txt @@ -4,12 +4,4 @@ Useful customizations that you can add are prompt - redefine prompt -To use virtualenvs you MUST define -export WORKON_HOME -export PROJECT_HOME - -then you can explicitly call 'venv' or leave it as a function to invoke at the -right moment - - /* vim: set ts=4 sw=4 tw=78 ft=text : */ diff --git a/zsh.d/prompts/pure b/zsh.d/prompts/pure index da1a722..92b8e90 160000 --- a/zsh.d/prompts/pure +++ b/zsh.d/prompts/pure @@ -1 +1 @@ -Subproject commit da1a722238febb9a4b97c77628fae753d1817490 +Subproject commit 92b8e9057988566b37ff695e70e2e9bbeb7196c8