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

.gitignore

@@ -0,0 +1 @@
+.DS_Store

fish/add-on.fish

@@ -1,10 +1,94 @@
+# 兼容性添加 PATH
+if functions -q fish_add_path
+    fish_add_path ~/.flinty/bin
+else
+    # 针对 Fish < 3.2.0 的版本
+    if not contains "$HOME/.flinty/bin" $PATH
+        set -gx PATH "$HOME/.flinty/bin" $PATH
+    end
+end
+
+set -gx LANG C.UTF-8
+set -gx LC_ALL C.UTF-8
+set -gx EDITOR nano
+
+# 禁用 Fish 默认欢迎语
+set -g fish_greeting ""
+
+function fish_greeting
+    echo ""
+    # 1. 顶部欢迎与 UTC-8 时间
+    set_color -o cyan
+    echo "Welcome back, $USER"
+    # 在 TZ 环境变量中，GMT+8 指向西八区 (UTC-8)
+    set -l current_time (env TZ="GMT-8" date "+%Y-%m-%d %H:%M:%S")
+    echo "Time (UTC-8): $current_time"
+    set_color normal
+    echo ""
+
+    # 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"
+        else if type -q apt
+            set pm_name "apt"
+        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
+
+    echo "Package Manager: $pm_name"
+    echo ""
+end
+
 ## 替换 ls 默认行为
 function ls --description 'alias ls to eza if possible'
+    # 1. 优先使用系统安装的 eza (PATH 里的)
     if type -q eza
         eza -la --icons $argv
-    else
-        command ls -la $argv
+        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
+                set target_bin "eza_x86_64-unknown-linux-gnu"
+            end
+        case aarch64 arm64
+            set target_bin "eza_aarch64-unknown-linux-gnu"
+    end
+
+    set -l custom_eza "$bin_path/$target_bin"
+
+    # 3. 检查文件是否存在且可执行
+    if test -n "$target_bin"; and test -x "$custom_eza"
+        $custom_eza -la --icons $argv
+        return
+    end
+
+    # 4. 既没有系统 eza 也没有本地二进制，回退到 command ls
+    command ls -la $argv
+end
+
+## 按修改时间排序列出文件
+function lt --description 'ls sorted by time'
+    ls --sort=modified $argv
 end
 
 ## 更新配置
@@ -21,5 +105,37 @@ function dotu
     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
+
+    # 循环检查端口是否被占用
+    # -t: TCP, -u: UDP, -l: Listening, -n: Numeric
+    while ss -tuln | grep -q ":$port "
+        set port (math $port + 1)
+    end
+
+    echo $port
+end
+
+function y
+    set -l tmp (mktemp -t "yazi-cwd.XXXXXX")
+    yazi $argv --cwd-file="$tmp"
+    if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+        builtin cd -- "$cwd"
+    end
+    rm -f -- "$tmp"
+end
+
 abbr -a port 'sudo ss -tulnp | grep'
-abbr -a process 'ps aux | grep'
+abbr -a process 'ps aux | grep'
+
+alias fastfetch="fastfetch --color-keys blue"

ssh/app-gitea-selfhost.pub

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

ssh/config

@@ -1,81 +1,219 @@
+Host *
+    IdentitiesOnly yes
+    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
-    Port 22
-    IdentityFile ~/.flinty/ssh/inc-r750xa.pub
-    IdentitiesOnly yes
 
 Host inc-backup-server
     HostName 10.0.88.33
     User aiteam
-    IdentityFile ~/.flinty/ssh/inc-backup-server.pub
-    IdentitiesOnly yes
 
 Host inc-xe9680
     HostName 10.0.24.40
     User flintylemming
-    Port 22
-    IdentityFile ~/.flinty/ssh/inc-xe9680.pub
-    IdentitiesOnly yes
 
-Host inc-dev
-    HostName 172.16.48.254
+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
-    IdentitiesOnly yes
-
-Host inc-radxa
-    HostName 172.16.49.114
-    User flintylemming
-    IdentityFile ~/.flinty/ssh/inc-radxa.pub
-    IdentitiesOnly yes
 
 Host inc-backup-server
     HostName 10.0.88.33
     User aiteam
-    IdentityFile ~/.flinty/ssh/inc-backup-server.pub
-    IdentitiesOnly yes
+
+Host inc-edr1
+    HostName 10.0.24.21
+    User flintylemming
+
+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-aosc
+    HostName 172.16.52.29
+    User flintylemming
+
+Host inc-dev
+    HostName 172.16.48.99
+    User flintylemming
+
+Host inc-ai-max-395
+    HostName 172.16.48.2
+    User muche
+
+Host inc-mac-mini-2014
+    HostName 172.16.48.166
+    User flintylemming
+
+Host inc-mac-mini-m4
+    HostName 172.16.48.102
+    User flintylemming
 
 Host idc-ucloud
     HostName 113.31.174.4
-    User root
-    IdentityFile ~/.flinty/ssh/idc-ucloud.pub
-    IdentitiesOnly yes
+    User flintylemming
 
 Host idc-aliyun-sh
     HostName 47.100.113.57
-    User ecs-user
-    IdentityFile ~/.flinty/ssh/idc-aliyun-sh.pub
-    IdentitiesOnly yes
+    User flintylemming
 
 Host idc-aws-sg
     HostName 52.220.5.200
-    User admin
+    User flintylemming
+
+Host idc-aws-sg-hf
+    HostName 112.31.107.190
+    Port 8848
+    User flintylemming
     IdentityFile ~/.flinty/ssh/idc-aws-sg.pub
-    IdentitiesOnly yes
 
 Host idc-hf-linux
     HostName 112.31.107.190
     Port 8850
     User flintylemming
     IdentityFile ~/.flinty/ssh/hf-linux.pub
-    IdentitiesOnly yes
 
 Host idc-hf-qts
     HostName 112.31.107.190
     Port 8845
     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
+    User flintylemming
+    IdentityFile ~/.flinty/ssh/hf-truenas.pub
+
+Host idc-hf-truenas-v6
+    HostName hf-truenas-v6.mitsea.com
+    User flintylemming
+    IdentityFile ~/.flinty/ssh/hf-truenas.pub
     IdentitiesOnly yes
 
-Host hf-linux
+Host idc-hk-iepl-v6
+    HostName 240e:96c:7100:1fe:1c8:c8aa:4ecc:ee
+    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
+
+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-misc
     HostName 192.168.5.12
     User flintylemming
-    IdentityFile ~/.flinty/ssh/hf-linux.pub
-    IdentitiesOnly yes
+
+Host hf-linux
+    HostName 192.168.5.10
+    User flintylemming
 
 Host hf-qts
     HostName 192.168.5.6
     User FlintyLemming
-    IdentityFile ~/.flinty/ssh/hf-qts.pub
-    IdentitiesOnly yes
+
+Host hf-truenas
+    HostName 192.168.5.5
+    User flintylemming
+
+Host hf-network-server
+    HostName 192.168.5.9
+    User flintylemming
+
+Host hf-radxa-o6
+    HostName 192.168.5.10
+    User flintylemming
+
+Host nj-fnos
+    HostName 192.168.2.6
+    User FlintyLemming
+
+Host nj-nanopi-neo3
+    HostName 192.168.2.10
+    User root
+
+Host zs-zos
+    HostName 192.168.6.6
+    Port 10000
+    User root
+
+Host sdwan-us-la
+    HostName 192.168.99.7
+    User root
+    IdentityFile ~/.flinty/ssh/us-la.pub
+
+Host frp-inc-xe9680
+    HostName frp-egg.com
+    User flintylemming
+    Port 60472
+    IdentityFile ~/.flinty/ssh/inc-xe9680.pub
+
+Host frp-inc-r750xa
+    HostName 112.31.107.190
+    User ubuntu
+    Port 7011
+    IdentityFile ~/.flinty/ssh/inc-r750xa.pub
+
+Host frp-us-la
+    HostName 112.31.107.190
+    User root
+    Port 7012
+    IdentityFile  ~/.flinty/ssh/us-la.pub

ssh/hf-linux-misc.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWqqDs8y2g7xRIf7HkVKMnaV5NISnPEGnlHBvFcJy/Y

ssh/hf-linux.pub

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

ssh/hf-network-server.pub

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

ssh/hf-radxa-o6.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVVfMvDYHMU2CdeOXO1Vg+JHNzAHKpc9qUpLOM1g5oy

ssh/hf-truenas.pub

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

ssh/idc-aliyun-sg.pub

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

ssh/idc-dmit-lax.pub

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

ssh/idc-hk-iepl.pub

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

ssh/idc-ovh-ks2.pub

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

ssh/idc-tencent-sg.pub

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

ssh/idc-vultr-bgp.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANImJYQnDnW8oLT/n6XGcw+sSvgwFq5PfTkzxACMj9a

ssh/idc-yxvm.pub

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

ssh/idc-zouter-hk.pub

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

ssh/inc-ai-max-395.pub

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

ssh/inc-aosc.pub

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

ssh/inc-dev.pub

@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5+PuaLTqGeTZsO5/9ZtdjIZQ7AzVWECTZF9Fd11FFA
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMvcIR/AQksyQPe4zAaRCaGJjYi90e0SxZh8AFkQqQMV

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

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL0lDjiNTTxAIqPXjclIwjDK+f6iF89UYwX2SFvtf8Fv

ssh/inc-mac-mini-m4.pub

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

ssh/inc-radxa.pub

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

ssh/inc-truenas.pub

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

ssh/nj-fnos.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHAkL+5R/8J4x5i1pKpJYpxQEFnWWCSvFreSjG+hmqSW

ssh/nj-nanopi-neo3.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJSeKZIbpt22qy6rN6T6iXtb5o/4G9BXXLsYacpIhX2a

ssh/us-la.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGfzysF0qhzQWvI+zFFJwpZqY6kbpEBOYHZBKewCMIF+

ssh/zs-zos.pub

@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF/6xR7NNpPJ7MrCx7qgo6hS1orwwX+4nMsyTdWl4/kc