From 6f5a2fb6d859e1a43be2df1dd73fe9679f0415b8 Mon Sep 17 00:00:00 2001 From: luk Date: Thu, 30 May 2024 12:22:31 +0800 Subject: [PATCH] u --- conda-init.sh | 19 ++++++++++++++++++ mac-homebrew-install.sh | 11 +++++------ nixhome/.gitignore.global.txt | 5 ++++- nixhome/.ssh/authorized_keys | 4 +++- proxy.sh | 37 ++++++++++++++++++++--------------- 5 files changed, 52 insertions(+), 24 deletions(-) create mode 100644 conda-init.sh diff --git a/conda-init.sh b/conda-init.sh new file mode 100644 index 0000000..f9e0da7 --- /dev/null +++ b/conda-init.sh @@ -0,0 +1,19 @@ +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +# __conda_setup="$('/opt/homebrew/Caskroom/miniconda/base/bin/conda' 'shell.bash' 'hook' 2> /dev/null)" +# if [ $? -eq 0 ]; then +# eval "$__conda_setup" +# else +# if [ -f "$(brew --repo)/Caskroom/miniconda/base/etc/profile.d/conda.sh" ]; then +# . "/opt/homebrew/Caskroom/miniconda/base/etc/profile.d/conda.sh" +# else +# export PATH="/opt/homebrew/Caskroom/miniconda/base/bin:$PATH" +# fi +# fi +# unset __conda_setup +# <<< conda initialize <<< + +echo "Please run this script with 'source', otherwise it won't take effect in the current shell." + +source "$(brew --repo)/Caskroom/miniconda/base/etc/profile.d/conda.sh" +conda activate base diff --git a/mac-homebrew-install.sh b/mac-homebrew-install.sh index 81f446c..feeea71 100644 --- a/mac-homebrew-install.sh +++ b/mac-homebrew-install.sh @@ -4,12 +4,12 @@ echo "Installing Homebrew on MacOS" /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" # default brew path: /opt/homebrew for Apple Silicon, /usr/local/Homebrew for macOS Intel and /home/linuxbrew/.linuxbrew for Linux -echo "if `brew --repo homebrew/core` not exists, you may need to git clone https://github.com/Homebrew/homebrew-core.git as well as for homebrew-cask" +# echo "if `brew --repo homebrew/core` not exists, you may need to git clone https://github.com/Homebrew/homebrew-core.git as well as for homebrew-cask" -# add brew to path on Apple Silicon: -# (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> /Users/luk/.bash_profile -# eval "$(/opt/homebrew/bin/brew shellenv)" -# 实际上执行了： +# add brew to path: +# (echo; echo 'eval "$(brew shellenv)"') >> ~/.bash_profile +# eval "$(brew shellenv)" +# 实际上执行了 on Apple Silicon： # export HOMEBREW_PREFIX="/opt/homebrew"; # export HOMEBREW_CELLAR="/opt/homebrew/Cellar"; # export HOMEBREW_REPOSITORY="/opt/homebrew"; @@ -20,4 +20,3 @@ echo "if `brew --repo homebrew/core` not exists, you may need to git clone https # uninstall: https://github.com/homebrew/install#uninstall-homebrew # /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)" - diff --git a/nixhome/.gitignore.global.txt b/nixhome/.gitignore.global.txt index 36e9cc0..2c29353 100644 --- a/nixhome/.gitignore.global.txt +++ b/nixhome/.gitignore.global.txt @@ -26,13 +26,16 @@ .deploy_git/ .idea/ .sass-cache/ -.wrangler +.wrangler/ /test/unit/coverage/ /test/e2e/reports/ node_modules/ *.aab *.apk *.ipa +*.rar +*.tgz +*.zip *.min.js *.min.css *.min.html diff --git a/nixhome/.ssh/authorized_keys b/nixhome/.ssh/authorized_keys index 879c3b2..be1fb9d 100644 --- a/nixhome/.ssh/authorized_keys +++ b/nixhome/.ssh/authorized_keys @@ -1,4 +1,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC20z+Vye8tcTjSrG8eLw54eEyabSc7/MGPzGa7/SKRPG6KP00hV38bZTg86mB4MGpY8MjJbK6GiEpCVGZAjm0bnDleqnkuGa9CpcNay0bAL+8g0Vvi3Vc9vJ9crmR735N4mjAQdgeGG1VCYXx3LAUsJavqVuOkRhAEQItpAb73oi4Ms7Oos9vdWLPDLjn7rZKM+iyi1n8zGwYXBlNzijzVZd/XXnb95mo36MBM+tySm5/aOIE6a11kX+74jKijh+1Ekz6Y1LMUm0j0mU0aJ0FCDVipIMZ0FI+W7l0RKNrIywIhI6d7CWAaJoDnaUKE+UMyJ7FRWeUrgyWxXWPJ7Kror5Won1HXlLhgb/IbITEM2mnCfJXd0JO9BurMDID3fYfANwsfFS7Av9/5RRbYv7Z/emJlkWfQhnzNzdo9rsU2p+7G+TTbmK6v7rlogUGtT55PGyOVBQNTjiPkijH2ulP/z8i/fqJwMINguysVztSR3Ouk7vxiZY+B4kZ6sh9Vvds= luk.lu@DoomBase +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDW8JpxQJX62DVuBnAMGD3L719PUsfHVAt5lAnAJDZl+QFbmtkOUPSi0YhyLBnf8eTn9W3I31mdoXWeQ4SvMWTixjgS/8J1wkLenPny/u3t5v4hgzJ+8rJEZONRLHxqqGz13ki3iScdziYlQtNezOTGFoNordRnDSmZcQdwrKLKSUrPr9xL6BW+j+yNp4yUxi6ePhZBp3SsEqVdn8rSJQQsVEkibkBNHzAM4lPWvaxK7XEpjC+jcTlDP7KYncwM85Tbn1G94AUcEiuGom1a9nWCqMbvuWGAC5FC1+4HjRa/VxTB1N4tvgBX6A+sPu5IjgxfSgrdXeoJhQ65WsmYahUG3vja6bH/bXACwo0lPl3r8sx2DfVchonyrnXtwJTsWHcRI/3dhreP/MyeaWmTCvNymvd1cy1TyjrCU77OIPBXgDsaM1flVV7lN33OE1XmxA4rccT0SCenUxt57NzviBfeQvUMpnJqSO0fSJXvHjPYeOKpe8udmH8RA5/pTyzcw9M= luk@doomship.local ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuRHLPwgwJFbTtg+bzJV5W2iQuPWQ0DoTUiD03R74xeFaYjnU+8uc2kuBUEuB1w3XOdu54RSdhNQU1/fKyddr03G/WWoI/e1YzzW1Y+YtZP9t65XyCXcCp66/eVnR8dXG6fwPn55uveiY7jVOS6Wn4YIWgIwXbZgHcO0rlg4IywkzZ+nvZMaw6+w087iOf/0Ket/j1GLFs8HEP7ZlTLHP0tUaT+ThPSmGsxUCmiG1wFCjf1/ejvyNEzuj+wNstLlk26/1zP/Yo5yYHy3gWqfzRmXMzm98DqDM2VMtNIkslkcGw4xCLcve+Ia6sIfIzHoCDbFaIrTlbQLdCl8BJ4vH5/o4cMLXLSLw29lj6EQT4qegARU//AwIjuF7pB1rekBXzNRxa8UUdJG6snubiOoLzk8srMqwB97IZCLzxL/eF75pD7ACgyxauN2tfsyYrGAS9NLV5wuvZuObTQfzstrZR7H/eDQNt58jBmGeRUfoOc8DcI/ER96UXrHGDTdJ2nlEzx8hdBlk+wnm9OZiqD0zEk2q4rGR5PdgCxb8TlYXsjFMrB7sjrEDQUhV72SRai92TwOlSt8wtOfDw02ftyw8VlWGIumNlM5JdlHgbZt3NE/GV7tm1vX+fSw8kwtrFZt92rEvx7R3uwUR+uwxbO/MD0j4NXyKgwvF4QjfwHpvdzQ== Generated By Termius ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBdXfteW8US09qDC4LNF2AFdlD4RVODLWHKCTPVbj/+s Generated By Termius -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDW8JpxQJX62DVuBnAMGD3L719PUsfHVAt5lAnAJDZl+QFbmtkOUPSi0YhyLBnf8eTn9W3I31mdoXWeQ4SvMWTixjgS/8J1wkLenPny/u3t5v4hgzJ+8rJEZONRLHxqqGz13ki3iScdziYlQtNezOTGFoNordRnDSmZcQdwrKLKSUrPr9xL6BW+j+yNp4yUxi6ePhZBp3SsEqVdn8rSJQQsVEkibkBNHzAM4lPWvaxK7XEpjC+jcTlDP7KYncwM85Tbn1G94AUcEiuGom1a9nWCqMbvuWGAC5FC1+4HjRa/VxTB1N4tvgBX6A+sPu5IjgxfSgrdXeoJhQ65WsmYahUG3vja6bH/bXACwo0lPl3r8sx2DfVchonyrnXtwJTsWHcRI/3dhreP/MyeaWmTCvNymvd1cy1TyjrCU77OIPBXgDsaM1flVV7lN33OE1XmxA4rccT0SCenUxt57NzviBfeQvUMpnJqSO0fSJXvHjPYeOKpe8udmH8RA5/pTyzcw9M= luk@doomship.local +# Touch ID on luk@doomship.local by Termius +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMHlke0ByhaF3tHH7eyM1jZIm06pBobetOBNnPDnNLfxxUpMK6gsvq5dfSJq5sUMRd8UtUMY0LJmp+cYO1jOEn8= diff --git a/proxy.sh b/proxy.sh index c7e0526..4d34cf0 100755 --- a/proxy.sh +++ b/proxy.sh @@ -3,26 +3,31 @@ echo "=== Please run with 'source proxy.sh', otherwise it has no effect on the current shell" if [ -n "$1" ]; then - proxySwitch="$1" + proxySwitch="$1" else - echo "=== 开启或关闭网络代理？ [s/1] for start, [t/0] for terminate, [anything else] for no change." - read -p ">>> " proxySwitch + echo "=== 开启或关闭网络代理？ [s/1] for start, [t/0] for terminate, [anything else] for no change." + read -p ">>> " proxySwitch fi # function proxy() { - if [ "$proxySwitch" == "s" ] || [ "$proxySwitch" == "1" ]; then - export all_proxy=socks5://127.0.0.1:7898 - export http_proxy=socks5://127.0.0.1:7898 - export https_proxy=socks5://127.0.0.1:7898 - echo -e "--- 已开启网络代理" - elif [ "$proxySwitch" == "t" ] || [ "$proxySwitch" == "0" ]; then - unset all_proxy - unset http_proxy - unset https_proxy - echo -e "--- 已关闭网络代理" - else - echo "--- Nothing changed." - fi + if [ "$proxySwitch" == "s" ] || [ "$proxySwitch" == "1" ]; then + echo "=== Proxy server running on port number: " + while [ ! "$PORT" ] + do + read -p ">>> " PORT + done + export all_proxy=socks5://127.0.0.1:$PORT + export http_proxy=socks5://127.0.0.1:$PORT + export https_proxy=socks5://127.0.0.1:$PORT + echo -e "--- 已开启网络代理" + elif [ "$proxySwitch" == "t" ] || [ "$proxySwitch" == "0" ]; then + unset all_proxy + unset http_proxy + unset https_proxy + echo -e "--- 已关闭网络代理" + else + echo "--- Nothing changed." + fi # } echo all_proxy="$all_proxy"