From 09b105162fcd2d175f1ff676f0b676a7c7d64913 Mon Sep 17 00:00:00 2001 From: Konano Date: Thu, 30 Nov 2023 12:31:06 +0800 Subject: [PATCH] experiment: custom zsh --- files/zsh/{80-environment.zsh => .zsh_user} | 4 ++++ files/zsh/{.zsh_init => 00-init.zsh} | 8 ++++++++ files/zsh/10-theme.zsh | 2 +- files/zsh/{50-function.zsh => 20-function.zsh} | 2 -- files/zsh/{20-alias.zsh => 50-alias.zsh} | 6 ++++++ files/zsh/90-other.zsh | 2 -- init_priv.sh | 14 +++++++------- init_user.sh | 8 ++++---- 8 files changed, 30 insertions(+), 16 deletions(-) rename files/zsh/{80-environment.zsh => .zsh_user} (88%) rename files/zsh/{.zsh_init => 00-init.zsh} (66%) rename files/zsh/{50-function.zsh => 20-function.zsh} (98%) rename files/zsh/{20-alias.zsh => 50-alias.zsh} (90%) diff --git a/files/zsh/80-environment.zsh b/files/zsh/.zsh_user similarity index 88% rename from files/zsh/80-environment.zsh rename to files/zsh/.zsh_user index 126cc31..4c04956 100644 --- a/files/zsh/80-environment.zsh +++ b/files/zsh/.zsh_user @@ -1,3 +1,7 @@ +# HOST="VM-ubuntu" + +command_exists() { command -v "$@" >/dev/null 2>&1; } + # pip3 export PATH=$PATH:$HOME/.local/bin command_exists trash-put && alias rm='trash-put' diff --git a/files/zsh/.zsh_init b/files/zsh/00-init.zsh similarity index 66% rename from files/zsh/.zsh_init rename to files/zsh/00-init.zsh index 016f80b..d4816a5 100644 --- a/files/zsh/.zsh_init +++ b/files/zsh/00-init.zsh @@ -1,3 +1,11 @@ +if [ "$__ZSH_CUSTOM_INIT_INCLUDED" = "yes" ]; then + return 0 +fi + +__ZSH_CUSTOM_INIT_INCLUDED="yes" + +# ==================================================================================================== + zstyle ':omz:update' mode reminder # just remind me to update when it's time zstyle ':omz:update' frequency 13 diff --git a/files/zsh/10-theme.zsh b/files/zsh/10-theme.zsh index 967bd97..4de2ab3 100644 --- a/files/zsh/10-theme.zsh +++ b/files/zsh/10-theme.zsh @@ -1,6 +1,6 @@ ZSH_THEME="ys-simple" -HOST="VM-ubuntu" +# HOST="VM-ubuntu" HIST_STAMPS='yyyy-mm-dd' DISABLE_AUTO_TITLE='true' diff --git a/files/zsh/50-function.zsh b/files/zsh/20-function.zsh similarity index 98% rename from files/zsh/50-function.zsh rename to files/zsh/20-function.zsh index 2c04b52..ec4d97b 100644 --- a/files/zsh/50-function.zsh +++ b/files/zsh/20-function.zsh @@ -50,5 +50,3 @@ __zsh_get_ip() { __zsh_get_ipv4 __zsh_get_ipv6 } - -alias net='__zsh_get_ip' diff --git a/files/zsh/20-alias.zsh b/files/zsh/50-alias.zsh similarity index 90% rename from files/zsh/20-alias.zsh rename to files/zsh/50-alias.zsh index 609013a..09c3fdc 100644 --- a/files/zsh/20-alias.zsh +++ b/files/zsh/50-alias.zsh @@ -30,3 +30,9 @@ if command_exists eza; then fi command_exists docker && alias gost='docker run --rm -p 9443:9443 --cpus=0.2 --memory=256mb gogost/gost -L socks5://nano:QpuwAqcsP8Xp@:9443' + +# functions from 20-function.zsh +alias net='__zsh_get_ip' + +# for Lazy +alias lazy='~/.lazy/run.sh' diff --git a/files/zsh/90-other.zsh b/files/zsh/90-other.zsh index 2be6082..a8417f4 100644 --- a/files/zsh/90-other.zsh +++ b/files/zsh/90-other.zsh @@ -2,5 +2,3 @@ _systemctl_unit_state() { typeset -gA _sys_unit_state _sys_unit_state=( $(__systemctl list-unit-files '$PREFIX*' | awk '{print $1, $2}') ) } - -alias lazy='~/.lazy/run.sh' diff --git a/init_priv.sh b/init_priv.sh index 97c3605..d7a234a 100755 --- a/init_priv.sh +++ b/init_priv.sh @@ -102,17 +102,17 @@ configure_zsh() { git_clone paulirish/git-open ~/.oh-my-zsh/custom/plugins/git-open --norecursive sudo apt install autojump -y - if ! grep -Fxq "source ~/.zsh_init" ~/.zshrc; then + if ! grep -Fxq "source ~/.oh-my-zsh/custom/00-init.zsh" ~/.zshrc; then local line_number=$(grep -n "source \$ZSH/oh-my-zsh.sh" .zshrc | cut -d : -f 1) - sed -i "${line_number}i source ~/.zsh_init\n" .zshrc + sed -i "${line_number}i source ~/.oh-my-zsh/custom/00-init.zsh\n" .zshrc fi + echo "\nsource ~/.zsh_user" | sudo tee -a ~/.zshrc >/dev/null - local zsh_scriptdir=$scriptdir/files/zsh - cp $scriptdir/files/zsh/.zsh_init ~/.zsh_init + cp $scriptdir/files/zsh/.zsh_user ~/.zsh_user + cp $scriptdir/files/zsh/00-init.zsh ~/.oh-my-zsh/custom/ cp $scriptdir/files/zsh/10-theme.zsh ~/.oh-my-zsh/custom/ - cp $scriptdir/files/zsh/20-alias.zsh ~/.oh-my-zsh/custom/ - cp $scriptdir/files/zsh/50-function.zsh ~/.oh-my-zsh/custom/ - cp $scriptdir/files/zsh/80-environment.zsh ~/.oh-my-zsh/custom/ + cp $scriptdir/files/zsh/20-function.zsh ~/.oh-my-zsh/custom/ + cp $scriptdir/files/zsh/50-alias.zsh ~/.oh-my-zsh/custom/ cp $scriptdir/files/zsh/90-other.zsh ~/.oh-my-zsh/custom/ cp $scriptdir/files/zsh/ys-simple.zsh-theme ~/.oh-my-zsh/custom/themes/ fi diff --git a/init_user.sh b/init_user.sh index b735aed..bf01e3b 100755 --- a/init_user.sh +++ b/init_user.sh @@ -78,11 +78,11 @@ configure_nodejs() { # ============================================================ -update_file $scriptdir/files/zsh/.zsh_init ~/.zsh_init +update_file $scriptdir/files/zsh/.zsh_user ~/.zsh_user +update_file $scriptdir/files/zsh/00-init.zsh ~/.oh-my-zsh/custom/00-init.zsh update_file $scriptdir/files/zsh/10-theme.zsh ~/.oh-my-zsh/custom/10-theme.zsh -update_file $scriptdir/files/zsh/20-alias.zsh ~/.oh-my-zsh/custom/20-alias.zsh -update_file $scriptdir/files/zsh/50-function.zsh ~/.oh-my-zsh/custom/50-function.zsh -update_file $scriptdir/files/zsh/80-environment.zsh ~/.oh-my-zsh/custom/80-environment.zsh +update_file $scriptdir/files/zsh/20-function.zsh ~/.oh-my-zsh/custom/20-function.zsh +update_file $scriptdir/files/zsh/50-alias.zsh ~/.oh-my-zsh/custom/50-alias.zsh update_file $scriptdir/files/zsh/90-other.zsh ~/.oh-my-zsh/custom/90-other.zsh update_file $scriptdir/files/zsh/ys-simple.zsh-theme ~/.oh-my-zsh/custom/themes/ys-simple.zsh-theme update_authorized_keys