From 59a90d968fd728a2b940a0906ef86639c2bf59b8 Mon Sep 17 00:00:00 2001
From: benj <benj@rse8.com>
Date: Tue, 12 May 2026 16:43:18 +0800
Subject: remove old stuff in .bashrc

---
 .bashrc | 72 +++++++++++++++++++++++++----------------------------------------
 1 file changed, 27 insertions(+), 45 deletions(-)

(limited to '.bashrc')

diff --git a/.bashrc b/.bashrc
index 6fddee6..7af9e14 100644
--- a/.bashrc
+++ b/.bashrc
@@ -72,51 +72,33 @@ export VISUAL="vim"
 #export TERM=xterm-256color
 #export TERMCAP=
 
-
-# if Mac
-if [ "$(uname)" = "Darwin" ]; then
-export HADOOP_HOME="`brew --prefix hadoop`"
-export MONO_GAC_PREFIX="/usr/local"
-export BASH_SILENCE_DEPRECATION_WARNING=1
-setjdk() { # Set java version on the fly
-    export JAVA_HOME=$(/usr/libexec/java_home -v $1)
-}
-export CLICOLOR=1
-export LSCOLORS=DxFxCxAxBxegedabagacad
-alias ls=' ls -GFh'
-
-# if Linux
-elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-    export LS_COLORS="di=1;33:ln=1;35:so=1;32:pi=1;30:ex=1;31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
-    alias pbcopy='xsel --clipboard --input'
-    alias c=pbcopy
-    alias pbpaste='xsel --clipboard --output'
-    alias v=pbpaste
-    alias open='xdg-open'
-    alias ls='ls --color=auto'
-
-    # Setup keychain
-    /usr/bin/keychain $HOME/.ssh/id_rsa \
-		      $HOME/.ssh/id_ed25519 \
-		      $HOME/.ssh/benj@rse8.pem \
-		      CBC575BB
-    . $HOME/.keychain/${HOSTNAME}-sh
-    . $HOME/.keychain/${HOSTNAME}-sh-gpg
-    # . $HOME/.keychain/${HOSTNAME}-sh-gpg # gpg keychain
-    # Flush all cached keys in memory. Any agent(s) will continue to run.
-    # Rationale: any user logging in should be assumed to be an intruder
-    # Passphrase is needed upon login, but cron jobs (etc...) will still
-    # run when logging out
-    # /usr/bin/keychain --clear
-
-fi
-
-# if Arch Linux
-if [ -f "/etc/arch-release" ]; then
-    alias cower='cower -c'
-    alias mc=minio-client
-    alias wifi='sudo wifi-menu'
-fi
+export LS_COLORS="di=1;33:ln=1;35:so=1;32:pi=1;30:ex=1;31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
+alias pbcopy='xsel --clipboard --input'
+alias c=pbcopy
+alias pbpaste='xsel --clipboard --output'
+alias v=pbpaste
+alias open='xdg-open'
+alias ls='ls --color=auto'
+
+# Setup keychain
+keys=()
+for f in "$HOME"/.ssh/*; do
+  [ -f "$f" ] || continue
+  case "$f" in
+    *.pub|*-cert.pub|known_hosts*|known_hosts.*|config) continue ;;
+  esac
+  ssh-keygen -y -f "$f" >/dev/null 2>&1 && keys+=("$f")
+done
+
+/usr/bin/keychain "${keys[@]}" CBC575BB
+. $HOME/.keychain/${HOSTNAME}-sh
+. $HOME/.keychain/${HOSTNAME}-sh-gpg
+# . $HOME/.keychain/${HOSTNAME}-sh-gpg # gpg keychain
+# Flush all cached keys in memory. Any agent(s) will continue to run.
+# Rationale: any user logging in should be assumed to be an intruder
+# Passphrase is needed upon login, but cron jobs (etc...) will still
+# run when logging out
+# /usr/bin/keychain --clear
 
 source ~/.mycfg/.git-completion.bash
 source ~/.mycfg/.bashrc.local
-- 
cgit v1.2.3