Merge branch 'main' of https://git.mitsea.com/FlintyLemming/dotfiles

bin/tzp

@@ -0,0 +1,47 @@
+#!/usr/bin/env fish
+
+set -l arg_count (count $argv)
+
+# 1. 检查是否有输入参数
+if test $arg_count -eq 0
+    echo "用法: zp <文件或目录1> [文件或目录2] ..."
+    exit 1
+end
+
+# 2. 预检：检查是否安装了 pigz
+set -l compress_tool ""
+if command -v pigz >/dev/null
+    # 使用 pigz 并指定压缩率 5
+    set compress_tool "-I 'pigz -5'"
+    set -l core_count (nproc 2>/dev/null; or echo "多")
+    echo "⚡ 检测到 pigz，将使用 $core_count 核并行压缩 (Level 5)"
+else
+    # 回退到标准 gzip
+    set compress_tool "-z"
+    echo "🐢 未检测到 pigz，使用标准 gzip 压缩"
+end
+
+# 3. 执行压缩逻辑
+if test $arg_count -eq 1
+    # 逻辑 A：单个参数，生成同名 .tar.gz
+    # 去掉末尾斜杠以获取干净的名称
+    set -l name (string trim -r -c / $argv[1])
+    set -l target "$name.tar.gz"
+    
+    echo "🚀 正在压缩单项目: $target"
+    # tar 默认保留软链接（对应 7z 的 -sni -snh 行为）
+    eval tar $compress_tool -cf "$target" "$argv[1]"
+else
+    # 逻辑 B：多个参数，生成 package_时间戳.tar.gz
+    set -l timestamp (date "+%Y%m%d_%H%M%S")
+    set -l target "package_$timestamp.tar.gz"
+    
+    echo "🚀 正在将 $arg_count 个项目打包至: $target"
+    eval tar $compress_tool -cf "$target" $argv
+end
+
+if test $status -eq 0
+    echo "✅ 压缩完成: $target"
+else
+    echo "❌ 压缩过程中出现错误"
+end

bin/utzp

@@ -0,0 +1,49 @@
+#!/usr/bin/env fish
+
+# 预检：检查是否安装了 pigz
+set -l has_pigz (command -v pigz)
+
+for file in $argv
+    if not test -f "$file"
+        echo "错误: $file 不是有效文件"
+        continue
+    end
+
+    # 1. 获取不带后缀的文件名
+    set -l base_name (string replace -r '\.(tar\..*|tgz|tbz2|txz)$' '' $file | string replace -r '\.[^.]+$' '' )
+
+    # 2. 确定解压工具参数 (只包含工具，不包含 -x 或 -t)
+    set -l tool_opt ""
+    if test -n "$has_pigz"; and string match -qr '\.(gz|tgz)$' "$file"
+        set tool_opt "-I pigz"
+        echo "🚀 检测到 Gzip，使用 pigz 加速预览与解压"
+    end
+
+    # 3. 预检：预览内容并获取根项目
+    # 注意：这里只传 $tool_opt，后面显式接 -tf
+    set -l tar_output (eval tar $tool_opt -tf "$file" 2>/dev/null)
+    
+    if test $status -ne 0
+        echo "❌ 错误: 无法读取 $file，文件可能损坏或格式不支持"
+        continue
+    end
+
+    # 提取根目录项目：过滤掉 ./ 并在第一个 / 处截断
+    set -l root_items (echo $tar_output | string replace -r '^\./' '' | string split -f 1 / | sort -u | string collect -n)
+    set -l item_count (count $root_items)
+
+    if test $item_count -eq 0
+        echo "跳过: $file 内容为空"
+        continue
+    end
+
+    # 4. 智能判断执行
+    if test $item_count -gt 1
+        echo "📦 检测到多个根项目 ($item_count)，解压至目录: $base_name/"
+        mkdir -p "$base_name"
+        eval tar $tool_opt -xf "$file" -C "$base_name"
+    else
+        echo "📄 检测到单个根项目 ($root_items[1])，直接解压..."
+        eval tar $tool_opt -xf "$file"
+    end
+end

bin/uzp

@@ -0,0 +1,55 @@
+#!/usr/bin/env fish
+
+for file in $argv
+    if not test -f "$file"
+        echo "错误: $file 不是有效文件"
+        continue
+    end
+
+    # 1. 获取不带后缀的文件名 (例如 temp.zip -> temp)
+    set -l base_name (string replace -r '\.[^.]+$' '' (basename "$file"))
+
+    # 2. 预检：获取压缩包顶级路径，并过滤掉系统垃圾
+    set -l all_paths (7z l -slt "$file" | grep "^Path = " | string replace -r '^Path = ' '')
+    set -l root_items
+    for p in $all_paths
+        # 只取路径的第一级
+        set -l root (string split -m 1 / $p)[1]
+        # 排除 macOS 垃圾和空字符，且去重
+        if not contains -- "$root" $root_items
+            if not string match -qr '^(__MACOSX|\.DS_Store|archive_temp)$' "$root"
+                set -a root_items "$root"
+            end
+        end
+    end
+
+    set -l item_count (count $root_items)
+
+    if test $item_count -eq 0
+        echo "跳过: $file 是空的或仅包含系统垃圾文件"
+        continue
+    end
+
+    # 3. 核心智能判断逻辑
+    set -l need_folder true
+    
+    if test $item_count -eq 1
+        # 情况 1: 只有一个根项目，直接解压
+        set need_folder false
+    else if contains -- "$base_name" $root_items
+        # 情况 2: 有多个项目，但其中一个文件夹的名字和压缩包同名
+        # 这通常意味着“自带容器”，为了防止嵌套，直接解压
+        set need_folder false
+        echo "💡 检测到包内已包含同名容器 '$base_name/'，将跳过额外目录创建..."
+    end
+
+    # 4. 执行解压
+    if test "$need_folder" = true
+        echo "📦 检测到多个根项目 ($item_count)，解压至目录: $base_name/"
+        mkdir -p "$base_name"
+        7z x -sni -mmt=on "$file" -o"$base_name"
+    else
+        echo "📄 结构清晰，直接解压..."
+        7z x -sni -mmt=on "$file"
+    end
+end

bin/zp

@@ -0,0 +1,24 @@
+#!/usr/bin/env fish
+# 把之前定义的 zp 函数内容贴进来，去掉外层的 function/end
+set -l arg_count (count $argv)
+
+# 检查是否有输入参数
+if test $arg_count -eq 0
+    echo "用法: zp <文件或目录1> [文件或目录2] ..."
+    return 1
+end
+
+if test $arg_count -eq 1
+    # 逻辑 A：单个参数，保持原样生成同名 zip
+    set -l name (string trim -r -c / $argv[1])
+    set -l target "$name.zip"
+    echo "🚀 正在多线程压缩单项目: $target"
+    7z a -sni -snh -tzip -mmt=on -mx=5 "$target" "$argv[1]"
+else
+    # 逻辑 B：多个参数，生成 package_20251219_1540.zip
+    set -l timestamp (date "+%Y%m%d_%H%M%S")
+    set -l target "package_$timestamp.zip"
+    echo "🚀 正在将 $arg_count 个项目打包至: $target"
+    # 直接传入 $argv，7z 会自动处理多个路径
+    7z a -sni -snh -tzip -mmt=on -mx=5 "$target" $argv
+end

fish/add-on.fish

@@ -110,6 +110,34 @@ function restore_cursor --on-event fish_postexec
     tput cnorm
 end
 
+## 让 sudo 能够识别自定义 bin 下的脚本
+function sudo --description "Replacement for sudo that preserves custom PATH commands"
+    # 1. 如果没有任何参数，直接运行原始 sudo (通常显示帮助)
+    if not set -q argv[1]
+        command sudo
+        return
+    end
+
+    # 2. 如果第一个参数是以 "-" 开头的选项 (比如 -i, -s, -u, -E)
+    # 我们直接把所有参数原样传给真正的 sudo，不做路径解析
+    if string match -q -- "-*" $argv[1]
+        command sudo $argv
+        return
+    end
+
+    # 3. 如果第一个参数是普通的命令名 (比如 zp, apt, vim)
+    # 使用 type -p 获取其完整路径。使用 -- 防止命令名本身带杠导致 type 报错
+    set -l command_path (type -p -- $argv[1] 2>/dev/null)
+
+    if test -n "$command_path"
+        # 找到了完整路径，调用真正的 sudo 运行该绝对路径
+        command sudo $command_path $argv[2..-1]
+    else
+        # 没找到路径（可能是内建命令或拼写错误），直接交给真正的 sudo 处理
+        command sudo $argv
+    end
+end
+
 function portcheck
     # 设置起始端口，如果没有传入参数则默认为 8840
     set -l port 8840
@@ -135,24 +163,7 @@ function y
     rm -f -- "$tmp"
 end
 
-abbr -a cc 'claude --permission-mode bypassPermissions'
 abbr -a port 'sudo ss -tulnp | grep'
-abbr -a process 'sudo ps aux | grep'
-abbr -a service 'sudo systemctl list-units --type=service --all | grep'
+abbr -a process 'ps aux | grep'
 
-alias fastfetch="fastfetch --color-keys blue"
-
-function proxy --description 'Set HTTP proxy for current session'
-    echo -n "HTTP proxy address (e.g. http://192.168.5.14:6152): "
-    read proxy_addr
-
-    if test -n "$proxy_addr"
-        set -gx HTTP_PROXY "$proxy_addr"
-        set -gx HTTPS_PROXY "$proxy_addr"
-        echo "Proxy set: $proxy_addr"
-    else
-        echo "Proxy cleared"
-        set -e HTTP_PROXY
-        set -e HTTPS_PROXY
-    end
-end
+alias fastfetch="fastfetch --color-keys blue"

ssh/app-gitea-selfhost.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILji+qkI6zDXSfTI1QRP+LCSoJrkI9uvHLzu0qxpq2yM

ssh/config

@@ -3,11 +3,6 @@ Host *
     IdentityFile ~/.flinty/ssh/%n.pub
     ForwardAgent yes
 
-Host git.mitsea.com
-    HostName git.mitsea.com
-    User git
-    IdentityFile ~/.flinty/ssh/app-gitea-selfhost.pub
-
 Host inc-r750xa
     HostName 10.0.24.20
     User ubuntu
@@ -20,34 +15,64 @@ Host inc-xe9680
     HostName 10.0.24.40
     User flintylemming
 
+Host inc-truenas
+    HostName 172.16.48.132
+    User flintylemming
+
+Host inc-dev-et
+    HostName 192.168.97.4
+    User flintylemming
+    IdentityFile ~/.flinty/ssh/inc-dev.pub
+
+Host inc-radxa
+    HostName 172.16.49.114
+    User flintylemming
+
 Host inc-backup-server
     HostName 10.0.88.33
     User aiteam
 
-Host inc-dev
-    HostName 172.16.48.99
+Host inc-edr1
+    HostName 10.0.24.21
     User flintylemming
 
-Host inc-mac-mini-m4
-    HostName 172.16.48.68
+Host inc-edr2
+    HostName 10.0.24.27
+    User flintylemming
+
+Host inc-ldns-dt-1221
+    HostName 10.0.24.40
+    Port 8851
+    User flintylemming
+
+Host inc-qts
+    HostName 172.16.49.43
+    User FlintyLemming
+
+Host inc-dev-temp
+    HostName 10.0.24.26
+    User flintylemming
+
+Host inc-ai-max-395
+    HostName 172.16.48.146
     User flintylemming
 
 Host idc-ucloud
     HostName 113.31.174.4
-    User flintylemming
+    User root
 
 Host idc-aliyun-sh
     HostName 47.100.113.57
-    User flintylemming
+    User ecs-user
 
 Host idc-aws-sg
     HostName 52.220.5.200
-    User ubuntu
+    User admin
 
 Host idc-aws-sg-hf
     HostName 112.31.107.190
     Port 8848
-    User flintylemming
+    User admin
     IdentityFile ~/.flinty/ssh/idc-aws-sg.pub
 
 Host idc-hf-linux
@@ -62,6 +87,17 @@ Host idc-hf-qts
     User FlintyLemming
     IdentityFile ~/.flinty/ssh/hf-qts.pub
 
+Host idc-nj-fnos-v6
+    HostName nj-fnos-v6.mitsea.com
+    User FlintyLemming
+    IdentityFile ~/.flinty/ssh/nj-fnos.pub
+
+Host idc-nj-fnos
+    HostName 112.31.107.190
+    Port 8842
+    User FlintyLemming
+    IdentityFile ~/.flinty/ssh/nj-fnos.pub
+
 Host idc-hf-truenas
     HostName 112.31.107.190
     Port 8849
@@ -74,10 +110,25 @@ Host idc-hf-truenas-v6
     IdentityFile ~/.flinty/ssh/hf-truenas.pub
     IdentitiesOnly yes
 
+Host idc-hk-iepl-v6
+    HostName 2408:8756:f5f:2a01:1:97a0:bb77:ff0d
+    User root
+    IdentityFile ~/.flinty/ssh/idc-hk-iepl.pub
+
+Host idc-hk-iepl-hf-v4
+    HostName 112.31.107.190
+    Port 8843
+    User root
+    IdentityFile ~/.flinty/ssh/idc-hk-iepl.pub
+
 Host idc-aliyun-sg
     HostName 47.237.137.245
     User root
 
+Host idc-yxvm
+    HostName 64.49.47.21
+    User root
+
 Host idc-vultr-bgp
     HostName 137.220.34.171
     User root
@@ -86,23 +137,6 @@ Host idc-dmit-lax
     HostName 69.63.202.73
     User root
 
-Host idc-ovh-ks2
-    HostName 145.239.244.171
-    User flintylemming
-
-Host idc-zouter-hk
-    HostName 103.97.200.27
-    User root
-
-Host idc-tencent-sg
-    HostName 43.134.27.201
-    User flintylemming
-
-Host hf-linux-proxy
-    HostName 192.168.5.10
-    User flintylemming
-    IdentityFile ~/.flinty/ssh/hf-linux.pub
-
 Host hf-linux
     HostName 192.168.5.12
     User flintylemming
@@ -119,22 +153,14 @@ Host hf-network-server
     HostName 192.168.5.9
     User flintylemming
 
-Host hf-macmini
-    HostName 192.168.5.12
-    User flintylemming
-
-Host hf-archived
-    HostName 172.16.48.31
-    User flintylemming
+Host nj-fnos
+    HostName 192.168.2.6
+    User FlintyLemming
 
 Host nj-nanopi-neo3
     HostName 192.168.2.10
     User root
 
-Host nj-nas
-    HostName 192.168.5.80
-    User flintylemming
-
 Host zs-zos
     HostName 192.168.6.6
     Port 10000
@@ -145,12 +171,14 @@ Host sdwan-us-la
     User root
     IdentityFile ~/.flinty/ssh/us-la.pub
 
-Host frp-us-la
+Host frp-inc-xe9680
     HostName 112.31.107.190
-    User root
-    Port 7012
-    IdentityFile  ~/.flinty/ssh/us-la.pub
+    User flintylemming
+    Port 7010
+    IdentityFile ~/.flinty/ssh/inc-xe9680.pub
 
-Host mtk-genio
-    HostName 172.16.48.130
-    User ubuntu
+Host frp-inc-r750xa
+    HostName 112.31.107.190
+    User flintylemming
+    Port 7011
+    IdentityFile ~/.flinty/ssh/inc-r750xa.pub

ssh/dragon-q6a.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEUg0TPLm/KxccyIqCwlL+En8e3uu/D2hCdv6YH0Z9J7

ssh/hf-archived.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKO5yxcEPfTcnlX0EEez5SvDBNt74ofKR/QKON2KEVEe

ssh/hf-linux.pub

@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMFf1rVv76W9EzRrcnpC0gGzAuj4fZDuqsEs38wRGArL
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWqqDs8y2g7xRIf7HkVKMnaV5NISnPEGnlHBvFcJy/Y

ssh/hf-macmini.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOAp/giPKiUtztJ8O4OeHbBCCVn/aov9l56pKnu/YKqd

ssh/idc-ovh-ks2.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB2ifq+UpmNzskfhKd2I2pEfKHjbG7vxVTL9W8JDD3EC

ssh/idc-tencent-sg.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH1g4zrd1TSSJJQTZ2XNEFMV+/H6/KPAKhNEGOKdJT6q

ssh/idc-yxvm.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFK9/NvPjti5NlwABrVrimUJdc1ilwCXKKCCaeO5YfvW

ssh/idc-zouter-hk.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIVgTG/mqTyhyFrs/kjH2GlurDFcLRc0Mu3BI1dg1vhc

ssh/inc-ai-max-395.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEjKfWYcKLlKSPc3cBgkdG9/P/QG79QdL5NNOMOrUO/Y

ssh/inc-edr1.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBEGz0gbLl0WdPZ7KKdd6dwuJsEZNbNjqJVgrOZjiPQW

ssh/inc-edr2.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5dH0cUYvCMZQPo0hXRSK9NXl8hQGGodrj24q9XZIuH

ssh/inc-ldns-dt-1221.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9LCdVn9Awo0GYgFGBJ0iuX5aLpZaLEZXJTqXJu5urC

ssh/inc-mac-mini-m4.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDotRuSdDlum7HFcFqYV6V6eEszpsj70H91RAGtOEQ5F

ssh/inc-qts.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGX76ty7gCXE9vhwlXlxY6JWq720EHH+rXFmzya1cMgV

ssh/inc-radxa.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKgZWk0H8AvR0NojqEKwEWTximPhhqwN4atJvaaNYQe/

ssh/inc-truenas.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5+PuaLTqGeTZsO5/9ZtdjIZQ7AzVWECTZF9Fd11FFA

ssh/mtk-genio.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBp2FjMNbIYkvUuxFhNdkUAJ2whs8ZFSvUa0C97SXead