Merge branch 'master' into lenovo-y480

dot/.bashrc

@@ -48,7 +48,7 @@ if [[ -n $(type -t _comp__split_longopt) ]] && [[ -z $(type -t _split_longopt) ]
     alias _split_longopt="_comp__split_longopt"
 fi
 
-for _ in ${HOME}/.bashrc.d/*; do
+for _ in ${HOME}/.bashrc.d/manager/*; do
     if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
         source "$_"
     fi
@@ -57,3 +57,9 @@ done
 if [[ -n "$(type -t mise-activate)" ]]; then
     mise-activate
 fi
+
+for _ in ${HOME}/.bashrc.d/*; do
+    if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
+        source "$_"
+    fi
+done

dot/.bashrc.d/manager/mise.bash

@@ -1,15 +1,14 @@
 basedir=$(realpath -m $(dirname "${BASH_SOURCE[0]:-$0}"))
-source "${basedir}/function.bash"
+source "${basedir}/../function.bash"
 
 unset basedir
 
 if [[ -x $(type -p mise) ]]; then
-    completion_cmd="mise completion --include-bash-completion-lib bash"
-    generate-bash-completion mise "$completion_cmd"
-    unset completion_cmd
-
     mise-activate() {
         eval "$(mise activate bash)"
+
+        local completion_cmd="mise completion --include-bash-completion-lib bash"
+        generate-bash-completion mise "$completion_cmd"
     }
 
     mise-deactivate() {

dot/.bashrc.d/manager/rust.bash

@@ -1,5 +1,5 @@
 basedir=$(realpath -m $(dirname "${BASH_SOURCE[0]:-$0}"))
-source "${basedir}/function.bash"
+source "${basedir}/../function.bash"
 
 unset basedir
 

dot/.bashrc.d/proxy.bash

@@ -1,10 +1,43 @@
-PROXY_IP="192.168.0.104"
+proxy_ip="192.168.0.104"
-HTTP_PROXY="http://${PROXY_IP}:20172"
+proxy_http_port="20172"
-SOCKS_PROXY="socks5://${PROXY_IP}:20170"
+# SOCKS_PROXY="socks5://${PROXY_IP}:20170"
+
+_proxy_config_validate() {
+    if [[ -z "$proxy_ip" && -z "$proxy_http_port" ]]; then
+        echo "error: proxy_ip and proxy_http_port is not set" >&2
+        return 1
+    fi
+    if [[ -z "$proxy_ip" ]]; then
+        echo "error: proxy_id is not set"
+        return 1
+    fi
+    if [[ -z "$proxy_http_port" ]]; then
+        echo "error: proxy_http_port is not set"
+        return 1
+    fi
+
+    if ! [[ "$proxy_http_port" =~ ^[0-9]+$ ]] || ((proxy_http_port < 1 || proxy_http_port > 65535)); then
+        echo "error: proxy_http_port is invalid: $proxy_http_port" >&2
+        return 1
+    fi
+
+    if command -v nc >/dev/null 2>&1; then
+        if ! nc -z -w2 "$proxy_ip" "$proxy_http_port" 2>/dev/null; then
+            echo "error: proxy $proxy_ip:$proxy_http_port is not reachable" >&2
+            return 1
+        fi
+    fi
+
+    return 0
+}
 
 set-shell-proxy() {
-    export http_proxy="$HTTP_PROXY"
+    _proxy_config_validate || return 1
-    export https_proxy="$HTTP_PROXY"
+
+    local http_proxy_url="http://${proxy_ip}:${proxy_http_port}"
+
+    export http_proxy="$http_proxy_url"
+    export https_proxy="$http_proxy_url"
 }
 
 unset-shell-proxy() {
@@ -13,8 +46,10 @@ unset-shell-proxy() {
 }
 
 set-git-proxy() {
-    prefix_cmd=""
+    _proxy_config_validate || return 1
-    flag="--global"
+
+    local prefix_cmd=""
+    local flag="--global"
     if [[ "$1" == "-s" ]]; then
         prefix_cmd="sudo"
         flag="--system"
@@ -22,13 +57,15 @@ set-git-proxy() {
         flag="--local"
     fi
 
-    $prefix_cmd git config $flag http.proxy $HTTP_PROXY
+    local http_proxy_url="http://${proxy_ip}:${proxy_http_port}"
+
+    $prefix_cmd git config $flag http.proxy $http_proxy_url
     $prefix_cmd git config $flag http.sslVerify false
 }
 
 unset-git-proxy() {
-    prefix_cmd=""
+    local prefix_cmd=""
-    flag="--global"
+    local flag="--global"
     if [[ "$1" == "-s" ]]; then
         prefix_cmd="sudo"
         flag="--system"
@@ -41,8 +78,12 @@ unset-git-proxy() {
 }
 
 set-npm-proxy() {
-    npm config set proxy $HTTP_PROXY
+    _proxy_config_validate || return 1
-    npm config set https-proxy $HTTP_PROXY
+
+    local http_proxy_url="http://${proxy_ip}:${proxy_http_port}"
+
+    npm config set proxy $http_proxy_url
+    npm config set https-proxy $http_proxy_url
 }
 
 unset-npm-proxy() {

dot/.bashrc.d/uv.bash

@@ -0,0 +1,12 @@
+basedir=$(realpath -m $(dirname "${BASH_SOURCE[0]:-$0}"))
+source "${basedir}/function.bash"
+
+unset basedir
+
+if [[ -x "$(type -p uv)" ]]; then
+    generate-bash-completion uv "uv generate-shell-completion bash"
+fi
+
+if [[ -x "$(type -p uvx)" ]]; then
+    generate-bash-completion uvx "uvx --generate-shell-completion bash"
+fi

dot/.bashrc.d/volta.bash

@@ -6,10 +6,9 @@ unset basedir
 export VOLTA_HOME="${HOME}/.volta"
 
 if [[ -x $(type -p volta) || -x "${VOLTA_HOME}/bin/volta" ]]; then
-    generate-bash-completion volta "volta completions bash"
-
     volta-activate() {
         add-to-path "${VOLTA_HOME}/bin"
+        generate-bash-completion volta "volta completions bash"
 
         # enable pnpm support
         # export VOLTA_FEATURE_PNPM=1

dot/.xprofile

@@ -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"
+# shell environment setup
-# pnpm
+export PATH="${HOME}/.local/bin${PATH:+:}$PATH"
-export PATH="~/.local/share/pnpm${PATH:+:}$PATH"
-# pnpm end
 
-# rust cargo
+for _ in ${HOME}/.bashrc.d/manager/*; do
-export PATH="~/.cargo/bin${PATH:+:}$PATH"
+    if [[ $_ == *.@(bash|sh) && -r $_ ]]; then
-if [[ -e "$HOME/.cargo/env" ]]; then
+        echo "$_"
-    . "$HOME/.cargo/env"
+        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

gentoo_portage/package.license

@@ -1,4 +1,4 @@
-app-arch/p7zip unRAR
+app-arch/7zip unRAR
 app-editors/cursor cursor
 app-editors/vscode Microsoft-vscode
 app-emulation/virtualbox-bin PUEL

gentoo_portage/package.use

@@ -21,8 +21,8 @@ x11-terms/rxvt-unicode 256-color blink fading-colors pixbuf unicode3
 app-editors/emacs cairo dynamic-loading gtk gui gzip-el harfbuzz json libxml2 sound source sqlite tree-sitter wide-int
 app-emacs/emacs-common gui
 
-# p7zip
+# 7zip
-app-arch/p7zip rar -wxwidgets
+app-arch/7zip rar
 
 # vim
 app-editors/vim lua python

gentoo_portage/repos.conf

@@ -33,7 +33,7 @@ sync-webrsync-verify-signature = yes
 [gentoo-zh]
 location = /var/db/repos/gentoo-zh
 sync-type = git
-sync-uri = https://github.com/microcai/gentoo-zh.git
+sync-uri = https://github.com/gentoo-zh/overlay.git
 auto-sync = yes
 
 [gentoo-zedhugh]