refactor(zsh): 移除 oh-my-zsh 依赖,改用原生配置
This commit is contained in:
+13
-12
@@ -6,28 +6,28 @@ setopt AUTO_CD # 输目录名直接 cd
|
|||||||
setopt INTERACTIVE_COMMENTS # 允许交互式 # 注释
|
setopt INTERACTIVE_COMMENTS # 允许交互式 # 注释
|
||||||
setopt NO_BEEP # 关蜂鸣
|
setopt NO_BEEP # 关蜂鸣
|
||||||
|
|
||||||
# ── Oh My Zsh ──
|
# ── 补全系统(必须在 fzf-tab 之前)──
|
||||||
ZSH=/usr/share/oh-my-zsh/
|
autoload -Uz compinit && compinit
|
||||||
ZSH_THEME="" # Starship 接管提示符
|
|
||||||
plugins=(
|
|
||||||
git # git 别名(gst, gco, gp...)
|
|
||||||
sudo # 双击 ESC 自动加 sudo
|
|
||||||
extract # x file.tar.gz 一键解压任何格式
|
|
||||||
direnv # direnv hook
|
|
||||||
)
|
|
||||||
ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh
|
|
||||||
[[ ! -d $ZSH_CACHE_DIR ]] && mkdir -p $ZSH_CACHE_DIR
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
|
||||||
|
|
||||||
# ── 外部插件 ──
|
# ── 外部插件 ──
|
||||||
source /usr/share/zsh/plugins/fzf-tab-git/fzf-tab.plugin.zsh
|
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-autosuggestions/zsh-autosuggestions.zsh
|
||||||
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh # 必须最后
|
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh # 必须最后
|
||||||
|
|
||||||
|
# ── 双击 ESC 自动加 sudo ──
|
||||||
|
sudo-command-line() {
|
||||||
|
[[ -z $BUFFER ]] && zle up-history
|
||||||
|
[[ $BUFFER != sudo\ * ]] && BUFFER="sudo $BUFFER"
|
||||||
|
zle end-of-line
|
||||||
|
}
|
||||||
|
zle -N sudo-command-line
|
||||||
|
bindkey '\e\e' sudo-command-line
|
||||||
|
|
||||||
# ── 工具初始化(顺序重要)──
|
# ── 工具初始化(顺序重要)──
|
||||||
eval "$(starship init zsh)"
|
eval "$(starship init zsh)"
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
eval "$(mise activate zsh)"
|
eval "$(mise activate zsh)"
|
||||||
|
eval "$(direnv hook zsh)"
|
||||||
eval "$(fzf --zsh)" # Ctrl+T 搜文件, Alt+C 搜目录
|
eval "$(fzf --zsh)" # Ctrl+T 搜文件, Alt+C 搜目录
|
||||||
eval "$(atuin init zsh)" # 必须在 fzf 之后,接管 Ctrl+R
|
eval "$(atuin init zsh)" # 必须在 fzf 之后,接管 Ctrl+R
|
||||||
|
|
||||||
@@ -49,6 +49,7 @@ alias cat="bat --paging=never"
|
|||||||
alias rm="trash-put"
|
alias rm="trash-put"
|
||||||
alias lg="lazygit"
|
alias lg="lazygit"
|
||||||
alias vi="nvim"
|
alias vi="nvim"
|
||||||
|
alias x="aunpack" # 万能解压(支持 tar/zip/7z/rar 等)
|
||||||
|
|
||||||
# 网络
|
# 网络
|
||||||
alias http="xh"
|
alias http="xh"
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ class BaseModule(Module):
|
|||||||
@pacman_packages
|
@pacman_packages
|
||||||
def pacman_packages(self) -> set[str]:
|
def pacman_packages(self) -> set[str]:
|
||||||
return {
|
return {
|
||||||
|
"7zip",
|
||||||
|
"atool",
|
||||||
"atuin",
|
"atuin",
|
||||||
"base-devel",
|
"base-devel",
|
||||||
"base",
|
"base",
|
||||||
@@ -56,6 +58,8 @@ class BaseModule(Module):
|
|||||||
"sudo",
|
"sudo",
|
||||||
"tealdeer",
|
"tealdeer",
|
||||||
"trash-cli",
|
"trash-cli",
|
||||||
|
"unrar",
|
||||||
|
"unzip",
|
||||||
"vim",
|
"vim",
|
||||||
"wget",
|
"wget",
|
||||||
"xh",
|
"xh",
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class ZshModule(Module):
|
|||||||
def aur_packages(self) -> set[str]:
|
def aur_packages(self) -> set[str]:
|
||||||
return {
|
return {
|
||||||
"fzf-tab-git",
|
"fzf-tab-git",
|
||||||
"oh-my-zsh-git",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def after_update(self, store):
|
def after_update(self, store):
|
||||||
|
|||||||
Reference in New Issue
Block a user