diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 0000000..e69de29 diff --git a/zsh/alias/alias.sh b/zsh/alias/alias.sh index a6c8542..95f76b2 100644 --- a/zsh/alias/alias.sh +++ b/zsh/alias/alias.sh @@ -25,7 +25,8 @@ alias lr='ls -tRFh' #sorted by date,recursive,show type,human readable alias lt='ls -ltFh' #long list,sorted by date,show type,human readable alias ll='ls -l' #long list alias ldot='ls -ld .*' -alias lS='ls -1FSsh' +alias lss='ls -1FSsh' +alias lS='lss' alias lart='ls -1Fcart' alias lrt='ls -1Fcrt' alias lsr='ls -lARFh' #Recursive list of files and directories diff --git a/zsh/functions/install.sh b/zsh/functions/install.sh index 81b3e4c..1d5fde4 100644 --- a/zsh/functions/install.sh +++ b/zsh/functions/install.sh @@ -91,7 +91,7 @@ if [ ! -d "$PLUGINS_PATH"/fzf-tab ]; then echo "fzf-tab is not downloaded. Downloading..." git clone https://github.com/Aloxaf/fzf-tab.git "$PLUGINS_PATH"/fzf-tab else - cd "$PLUGINS_PATH/fzf-tab" || exit 1 + cd "$PLUGINS_PATH"/fzf-tab || exit 1 if [ ! -d .git ]; then echo "fzf-tab is not a git repository. Please remove $PLUGINS_PATH/fzf-tab and try again." exit 1 @@ -101,3 +101,18 @@ else fi fi +# git clone oh-my-zsh +if [ ! -d "$PLUGINS_PATH"/ohmyzsh ]; then + echo "Oh My Zsh is not downloaded. Downloading..." + # git clone https://github.com/ohmyzsh/ohmyzsh.git "$PATH_OHMYZSH" + git clone https://gitee.com/mirrors/ohmyzsh.git "$PLUGINS_PATH"/ohmyzsh +else + cd "$PLUGINS_PATH"/ohmyzsh || exit 2 + if [ ! -d .git ]; then + echo "Oh My Zsh is not a git repository. Please remove $PLUGINS_PATH/ohmyzsh and try again." + exit 1 + else + echo "Oh My Zsh is already exist. Updating..." + git pull + fi +fi diff --git a/zsh/plugins/.gitignore b/zsh/plugins/.gitignore index c96a04f..d6b7ef3 100644 --- a/zsh/plugins/.gitignore +++ b/zsh/plugins/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore \ No newline at end of file +!.gitignore diff --git a/zsh/zshrc b/zsh/zshrc index 639a751..cf2974f 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -30,6 +30,9 @@ source $ZSH_PLUGIN_PATH/zsh-autocomplete/zsh-autocomplete.plugin.zsh source $ZSH_PLUGIN_PATH/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source $ZSH_PLUGIN_PATH/fzf-tab/fzf-tab.plugin.zsh +source $ZSH_PLUGIN_PATH/ohmyzsh/plugins/fzf/fzf.plugin.zsh +source $ZSH_PLUGIN_PATH/ohmyzsh/plugins/python/python.plugin.zsh + # zoxide if (( $+commands[zoxide] )); then eval "$(zoxide init --cmd ${ZOXIDE_CMD_OVERRIDE:-z} zsh)"