diff --git a/home-config.sh b/home-config.sh index 72cd37b..057245e 100755 --- a/home-config.sh +++ b/home-config.sh @@ -46,7 +46,7 @@ then chmod 700 $HomePath/.ssh if [ -e $HomePath/.ssh/authorized_keys ] then - echo "--- Removing $HomePath/.ssh/authorized_keys ..." + echo "--- Renaming $HomePath/.ssh/authorized_keys to authorized_keys.backup ..." mv $HomePath/.ssh/authorized_keys $HomePath/.ssh/authorized_keys.backup fi echo "--- Linking $SourcePath/authorized_keys to $HomePath/.ssh/authorized_keys ..." diff --git a/nixhome/.bashrc b/nixhome/.bashrc index 5c2aa66..7d4c751 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -81,18 +81,29 @@ case "$TERM" in esac # nvm settings -export NVM_DIR="$HOME/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +if [ -d $HOME/.nvm ] +then + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion +fi + +# let MacOS uses the same variable so that vscode-sshfs can use "$USERPROFILE/.ssh/id_rsa" uniformly. +export USERPROFILE=$HOME + +# add sysconfig to path +if [ -d /Users/luk.lu/faronear/fon/sysconfig ] +then + export PATH=/Users/luk.lu/faronear/fon/sysconfig:$PATH +else if [ -d /faronear/fon/sysconfig ] + export PATH=/faronear/fon/sysconfig:$PATH +fi if [ -f ~/.bashrc_custom ] then source ~/.bashrc_custom fi -# align for vscode-sshfs in MacOS and windows -export USERPROFILE=$HOME - ################################################################################ # End Of File: "~/.bashrc" ################################################################################ diff --git a/ssr-install.sh b/ssr-install.sh index bd8c63f..a1641bc 100755 --- a/ssr-install.sh +++ b/ssr-install.sh @@ -1,3 +1,5 @@ +#!/bin/bash + apt update && apt install -y zip cd /faronear/ mkdir bin diff --git a/windows/GetColor.exe b/windows/GetColor.exe deleted file mode 100755 index 0656f54..0000000 Binary files a/windows/GetColor.exe and /dev/null differ diff --git a/windows/add-ThisComputer-subfolders.reg b/windows/ThisComputer-add-subfolders.reg similarity index 100% rename from windows/add-ThisComputer-subfolders.reg rename to windows/ThisComputer-add-subfolders.reg diff --git a/windows/delete-ThisComputer-subfolders.reg b/windows/ThisComputer-delete-subfolders.reg similarity index 100% rename from windows/delete-ThisComputer-subfolders.reg rename to windows/ThisComputer-delete-subfolders.reg diff --git a/windows/linkd.exe b/windows/linkd.exe deleted file mode 100755 index 41fb5a9..0000000 Binary files a/windows/linkd.exe and /dev/null differ diff --git a/windows/use-classic-RightClickMenu.bat b/windows/right-click-classic.bat similarity index 100% rename from windows/use-classic-RightClickMenu.bat rename to windows/right-click-classic.bat diff --git a/windows/use-win11-RightClickMenu.bat b/windows/right-click-win11.bat similarity index 100% rename from windows/use-win11-RightClickMenu.bat rename to windows/right-click-win11.bat