添加 ssh/hf-macmini.pub

fish/add-on.fish

@@ -1,6 +1,4 @@
-# =============================================================================
+# 兼容性添加 PATH
-# 1. 环境配置 & 路径兼容
-# =============================================================================
 if functions -q fish_add_path
     fish_add_path ~/.flinty/bin
 else
@@ -19,26 +17,31 @@ set -g fish_greeting ""
 
 function fish_greeting
     echo ""
-    # 顶部欢迎与 补正后的时区时间
+    # 1. 顶部欢迎与 UTC-8 时间
     set_color -o cyan
     echo "Welcome back, $USER"
-    # 在 TZ 环境变量中，GMT-8 指向东八区 (北京时间)
+    # 在 TZ 环境变量中，GMT+8 指向西八区 (UTC-8)
     set -l current_time (env TZ="GMT-8" date "+%Y-%m-%d %H:%M:%S")
-    echo "Time (Asia/Shanghai): $current_time"
+    echo "Time (UTC-8): $current_time"
     set_color normal
     echo ""
 
-    # 包管理器逻辑 (优先检查 oma)
+    # 3. 包管理器逻辑 (优先检查 oma)
     set -l pm_name ""
     if type -q oma
         set pm_name (set_color -o green)"oma"(set_color normal)
     else
         # 回退到系统默认包管理器
-        if type -q brew; set pm_name "Homebrew"
+        if type -q brew
-        else if type -q apt; set pm_name "apt"
+            set pm_name "Homebrew"
-        else if type -q pacman; set pm_name "pacman"
+        else if type -q apt
-        else if type -q dnf; set pm_name "dnf"
+            set pm_name "apt"
-        else; set pm_name "Default PM"
+        else if type -q pacman
+            set pm_name "pacman"
+        else if type -q dnf
+            set pm_name "dnf"
+        else
+            set pm_name "Default PM"
         end
     end
 
@@ -46,19 +49,22 @@ function fish_greeting
     echo ""
 end
 
-# =============================================================================
+## 替换 ls 默认行为
-# 2. 核心增强函数 (ls / eza 包装器)
+function ls --description 'alias ls to eza if possible'
-# =============================================================================
+    # 1. 优先使用系统安装的 eza (PATH 里的)
-function ls --description 'alias ls to eza with directory `.tldr` descriptions'
-    # 1. 核心路由：确定可用的 eza 二进制文件路径（继承你的多架构判定）
-    set -l eza_bin ""
     if type -q eza
-        set eza_bin "eza"
+        eza -la --icons $argv
-    else
+        return
+    end
+
+    # 2. 如果系统没有，尝试根据架构寻找 ~/.flinty/bin 下的二进制文件
     set -l arch (uname -m)
     set -l target_bin ""
+    set -l bin_path "$HOME/.flinty/bin"
+
     switch $arch
         case x86_64
+            # 如果是 Alpine Linux，通常需要用 musl 版本 (根据你提供的文件名)
             if test -f /etc/alpine-release
                 set target_bin "eza_x86_64-unknown-linux-musl"
             else
@@ -68,135 +74,58 @@ function ls --description 'alias ls to eza with directory `.tldr` descriptions'
             set target_bin "eza_aarch64-unknown-linux-gnu"
     end
 
-        set -l custom_eza "$HOME/.flinty/bin/$target_bin"
+    set -l custom_eza "$bin_path/$target_bin"
+
+    # 3. 检查文件是否存在且可执行
     if test -n "$target_bin"; and test -x "$custom_eza"
-            set eza_bin "$custom_eza"
+        $custom_eza -la --icons $argv
-        end
+        return
     end
 
-    # 2. 兜底策略：如果最终没有找到任何 eza，完全回退到原生 command ls
+    # 4. 既没有系统 eza 也没有本地二进制，回退到 command ls
-    if test -z "$eza_bin"
     command ls -la $argv
-        return
 end
 
-    # 3. 动态描述注入核心引擎
+## 按修改时间排序列出文件
-    # 建立展示行：带颜色、带图标、全长格式 (-la 是你预期的默认行为)
-    set -l lines ($eza_bin -la --icons=always --color=always $argv)
-
-    # 建立纯净路径行：过滤掉所有格式化干扰项，确保只拿到绝对路径
-    # 必须保留你的自定义排序/过滤参数（如 --sort），但剔除 -l 和 --icons
-    set -l clean_args
-    for arg in $argv
-        switch $arg
-            case '-l' '--long' '--icons'
-                # 忽略影响长格式和图标的参数
-            case '-la' '-al' '-lA' '-Al'
-                # 如果是组合参数，剥离掉 'l'，保留 'a' 或 'A' 保证文件对齐
-                set -l stripped (string replace -a 'l' '' $arg)
-                if test "$stripped" != "-"
-                    set -a clean_args $stripped
-                end
-            case '*'
-                set -a clean_args $arg
-        end
-    end
-
-    # 核心修正：只用 -a（显示隐藏）和 -1（单列），配合 --absolute=on 拿到纯路径
-    set -l paths ($eza_bin -a -1 --absolute=on --color=never $clean_args 2>/dev/null)
-
-    # 安全网：如果由于特殊参数导致行数不匹配，安全回退到原装输出防止错位
-    if test (count $lines) -ne (count $paths)
-        $eza_bin -la --icons=always $argv
-        return
-    end
-
-    # 双路循环渲染
-    for i in (seq (count $lines))
-        set -l line $lines[$i]
-        set -l target_path $paths[$i]
-
-        # 此时 $target_path 是完美的纯绝对路径，test 能够精准命中
-        if test -d "$target_path"; and test -f "$target_path/.tldr"
-            set -l desc (head -n 1 "$target_path/.tldr" | string trim)
-            if test -n "$desc"
-                # 在行尾追加青色 (Cyan) 的备忘后缀
-                echo -e "$line \e[36m<- $desc\e[0m"
-                continue
-            end
-        end
-        echo -e "$line"
-    end
-end
-
-## 按修改时间排序列出文件 (由于 ls 已增强，此命令自动继承备忘显示)
 function lt --description 'ls sorted by time'
     ls --sort=modified $argv
 end
 
-# =============================================================================
-# 3. 运维与效率工具函数
-# =============================================================================
-
-## 快捷为目录添加或查看备忘贴纸
-function tldr --description 'Add or view description note for a directory'
-    if test (count $argv) -eq 0
-        echo "Usage: tldr \"你的项目描述\" [目录路径]"
-        echo "   Or: tldr -d [目录路径] (删除备忘)"
-        return 1
-    end
-
-    if test "$argv[1]" = "-d"
-        set -l target_dir "."
-        if test (count $argv) -gt 1; set target_dir $argv[2]; end
-        if test -f "$target_dir/.tldr"
-            rm "$target_dir/.tldr"
-            echo "已移除 '$target_dir' 的备忘贴纸。"
-        end
-        return 0
-    end
-
-    set -l desc $argv[1]
-    set -l target_dir "."
-    if test (count $argv) -gt 1; set target_dir $argv[2]; end
-
-    if not test -d "$target_dir"
-        echo (set_color -o red)"Error: $target_dir 不是一个有效的目录"(set_color normal)
-        return 1
-    end
-
-    echo "$desc" > "$target_dir/.tldr"
-    echo "成功贴上标签 ➜ 有效目录: '$target_dir' [ $desc ]"
-end
-
 ## 更新配置
 function dotu
     set -l current_dir (pwd)
+    
     cd $HOME/.flinty
     if git pull
         source ~/.config/fish/config.fish
         echo "Config reloaded successfully!"
     end
+    
+    # 回到原位
     cd $current_dir
 end
 
-## 修复某些命令行工具导致的光标消失
+## 修复光标消失
 function restore_cursor --on-event fish_postexec
     tput cnorm
 end
 
-## 自动递增探测可用端口
 function portcheck
+    # 设置起始端口，如果没有传入参数则默认为 8840
     set -l port 8840
-    if test (count $argv) -gt 0; set port $argv[1]; end
+    if test (count $argv) -gt 0
+        set port $argv[1]
+    end
 
+    # 循环检查端口是否被占用
+    # -t: TCP, -u: UDP, -l: Listening, -n: Numeric
     while ss -tuln | grep -q ":$port "
         set port (math $port + 1)
     end
+
     echo $port
 end
 
-## Yazi 联动：退出时自动切换到最后所在的目录
 function y
     set -l tmp (mktemp -t "yazi-cwd.XXXXXX")
     yazi $argv --cwd-file="$tmp"
@@ -206,28 +135,8 @@ function y
     rm -f -- "$tmp"
 end
 
-# =============================================================================
-# 4. 别名与缩写 (Abbr / Alias)
-# =============================================================================
-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'
 
 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

ssh/ca-linux.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICXq+d3KevzPH2FT4s3h9t04TV4h/URkS7g9mn4mJoG3

ssh/config

@@ -29,11 +29,7 @@ Host inc-dev
     User flintylemming
 
 Host inc-mac-mini-m4
-    HostName 172.16.48.68
+    HostName 172.16.48.102
-    User flintylemming
-
-Host inc-ai-max-395
-    HostName 172.16.48.2
     User flintylemming
 
 Host idc-ucloud
@@ -46,7 +42,7 @@ Host idc-aliyun-sh
 
 Host idc-aws-sg
     HostName 52.220.5.200
-    User ubuntu
+    User admin
 
 Host idc-aws-sg-hf
     HostName 112.31.107.190
@@ -102,17 +98,8 @@ Host idc-tencent-sg
     HostName 43.134.27.201
     User flintylemming
 
-Host idc-sg
-    HostName 188.253.120.21
-    User debian
-    
-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
+    HostName 192.168.5.10
     User flintylemming
 
 Host hf-qts
@@ -131,26 +118,10 @@ Host hf-macmini
     HostName 192.168.5.12
     User flintylemming
 
-Host hf-archived
-    HostName 192.168.5.80
-    User flintylemming
-
-Host hf-restic
-    HostName 192.168.5.8
-    User FlintyLemming
-
 Host nj-nanopi-neo3
     HostName 192.168.2.10
     User root
 
-Host nj-nas
-    HostName 192.168.5.80
-    User flintylemming
-
-Host nj-linux
-    HostName 192.168.2.12
-    User flintylemming
-
 Host zs-zos
     HostName 192.168.6.6
     Port 10000
@@ -166,22 +137,3 @@ Host frp-us-la
     User root
     Port 7012
     IdentityFile  ~/.flinty/ssh/us-la.pub
-
-Host frp-inc-xe9680
-    HostName frp-fee.com
-    User flintylemming
-    Port 31427
-    IdentityFile  ~/.flinty/ssh/inc-xe9680.pub
-
-Host mtk-genio
-    HostName 172.16.48.130
-    User ubuntu
-
-Host kirin-990-pc
-    HostName 172.16.48.195
-    User flintylemming
-
-Host ca-linux
-    HostName 70.66.137.94
-    User flintylemming
-    Port 8840

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-restic.pub

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

ssh/idc-sg.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKd1/ECqDbyxgpY5qt6x5SVVPXKoVX1Lm/isN0YyJ4FW

ssh/inc-ai-max-395.pub

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

ssh/kirin-990-pc.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAc3/NU8F61BoKl5zSwJBjkdPilQgd4fHLxlYDD0EonK

ssh/mtk-genio.pub

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

ssh/nj-linux.pub

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