diff --git a/modules/zsh/dotfiles/.zshrc b/modules/zsh/dotfiles/.zshrc index 7db0a13..ad20713 100644 --- a/modules/zsh/dotfiles/.zshrc +++ b/modules/zsh/dotfiles/.zshrc @@ -1,8 +1,18 @@ # Oh My Zsh -export ZSH="$HOME/.oh-my-zsh" -ZSH_THEME="robbyrussell" -plugins=(git zsh-autosuggestions zsh-syntax-highlighting) +ZSH=/usr/share/oh-my-zsh/ +ZSH_THEME="ys" +plugins=(git) +ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh +if [[ ! -d $ZSH_CACHE_DIR ]]; then + mkdir $ZSH_CACHE_DIR +fi source $ZSH/oh-my-zsh.sh +source /usr/share/zsh/plugins/fzf-tab-git/fzf-tab.plugin.zsh +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh +source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + +# bun +export PATH="$HOME/.bun/bin:$PATH" # mise if command -v mise &> /dev/null; then @@ -15,6 +25,6 @@ if command -v zoxide &> /dev/null; then fi # Aliases -alias ls='ls --color=auto' -alias ll='ls -lah' -alias cd='z' +alias cd="z" +alias cdi="zi" +alias rm="trash-put" diff --git a/modules/zsh/module.yaml b/modules/zsh/module.yaml index 673fe01..12cee84 100644 --- a/modules/zsh/module.yaml +++ b/modules/zsh/module.yaml @@ -1,5 +1,5 @@ +--- description: Zsh 及插件 - dotfiles: - source: dotfiles/.zshrc target: ~/.zshrc diff --git a/modules/zsh/packages.yaml b/modules/zsh/packages.yaml index 456856a..7e71d7f 100644 --- a/modules/zsh/packages.yaml +++ b/modules/zsh/packages.yaml @@ -1,6 +1,8 @@ +--- packages: - - zsh - - zsh-completions + - fzf-tab-git - oh-my-zsh-git + - zsh - zsh-autosuggestions + - zsh-completions - zsh-syntax-highlighting