dot: 重构 bashrc.d 目录结构,调整版本(包)管理器脚本加载顺序
- 将 mise、rust 等管理器脚本移入 manager/ 子目录,与工具脚本区分 - mise/volta 的补全改到各自 activate 函数内延迟生成,避免未激活时执行 - 新增 uv/uvx 的 bash 补全 - .bashrc 拆分为先加载 manager/ 再加载顶层脚本的两段流程 - .xprofile 改用 bash 解释并复用相同的脚本加载流程
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env sh
|
||||
#!/bin/bash
|
||||
|
||||
#xrandr --output HDMI-1 --same-as LVDS-1
|
||||
|
||||
@@ -38,14 +38,23 @@ fcitx5 -d
|
||||
#sudo service shadowsocks.client start
|
||||
# emacs --daemon
|
||||
|
||||
export PATH="~/.local/bin${PATH:+:}$PATH"
|
||||
# pnpm
|
||||
export PATH="~/.local/share/pnpm${PATH:+:}$PATH"
|
||||
# pnpm end
|
||||
# shell environment setup
|
||||
export PATH="${HOME}/.local/bin${PATH:+:}$PATH"
|
||||
|
||||
# rust cargo
|
||||
export PATH="~/.cargo/bin${PATH:+:}$PATH"
|
||||
if [[ -e "$HOME/.cargo/env" ]]; then
|
||||
. "$HOME/.cargo/env"
|
||||
for _ in ${HOME}/.bashrc.d/manager/*; do
|
||||
if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
|
||||
echo "$_"
|
||||
source "$_"
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ -n "$(type -t mise-activate)" ]]; then
|
||||
mise-activate
|
||||
fi
|
||||
# rust cargo end
|
||||
|
||||
for _ in ${HOME}/.bashrc.d/*; do
|
||||
echo "$_"
|
||||
if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
|
||||
source "$_"
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user