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

fish/add-on.fish

@@ -135,24 +135,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 process 'ps aux | grep'
-abbr -a service 'sudo systemctl list-units --type=service --all | grep'
 
-alias fastfetch="fastfetch --color-keys blue"
+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/config

@@ -20,16 +20,50 @@ 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
+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-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.99
     User flintylemming
 
-Host inc-mac-mini-m4
+Host inc-mac-mini-2014
-    HostName 172.16.48.68
+    HostName 172.16.48.166
     User flintylemming
 
 Host idc-ucloud
@@ -38,16 +72,16 @@ Host idc-ucloud
 
 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 +96,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 +119,25 @@ Host idc-hf-truenas-v6
     IdentityFile ~/.flinty/ssh/hf-truenas.pub
     IdentitiesOnly yes
 
+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
@@ -86,23 +146,14 @@ Host idc-dmit-lax
     HostName 69.63.202.73
     User root
 
-Host idc-ovh-ks2
+Host idc-op-eu
-    HostName 145.239.244.171
+    HostName 51.158.146.60
     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 +170,14 @@ Host hf-network-server
     HostName 192.168.5.9
     User flintylemming
 
-Host hf-macmini
+Host nj-fnos
-    HostName 192.168.5.12
+    HostName 192.168.2.6
-    User flintylemming
+    User FlintyLemming
-
-Host hf-archived
-    HostName 172.16.48.31
-    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 +188,20 @@ Host sdwan-us-la
     User root
     IdentityFile ~/.flinty/ssh/us-la.pub
 
+Host frp-inc-xe9680
+    HostName 112.31.107.190
+    User flintylemming
+    Port 7010
+    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
+    IdentityFile  ~/.flinty/ssh/us-la.pub
-
-Host mtk-genio
-    HostName 172.16.48.130
-    User ubuntu

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-tencent-sg.pub

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

ssh/idc-yxvm.pub

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

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

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

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