diff --git a/git-ignore-find2merge.bat b/git-ignore-find2merge.bat index f796c40..880ba7e 100644 --- a/git-ignore-find2merge.bat +++ b/git-ignore-find2merge.bat @@ -23,19 +23,19 @@ if not exist "%ROOTPATH%" ( echo √√√ ROOTPATH = [[%ROOTPATH%]] ) -echo === Enter [path to .gitignore.global.txt] or [leave blank] for default [[%CD%]] +echo === Enter [path to .gitignore.global.txt] or [leave blank] for default [[https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/.gitignore.global.txt]] set /p IGNOREPATH=">>> " echo; if "" == "%IGNOREPATH%" ( - set IGNOREPATH=%CD%/.gitignore.global.txt + set IGNOREPATH=https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/.gitignore.global.txt ) else ( for %P in (%IGNOREPATH%) do set "IGNOREPATH=%~dpnxP/.gitignore.global.txt" -) -if not exist "%IGNOREPATH%" ( - echo ××× [[%IGNOREPATH%]] not exist! Exit now. *** - @ GOTO END -) else ( - echo √√√ IGNOREPATH = [[%IGNOREPATH%]] + if not exist "%IGNOREPATH%" ( + echo ××× [[%IGNOREPATH%]] not exist! Exit now. *** + @ GOTO END + ) else ( + echo √√√ IGNOREPATH = [[%IGNOREPATH%]] + ) ) pushd %ROOTPATH% diff --git a/git-ignore-find2merge.sh b/git-ignore-find2merge.sh index 0f18fe5..1dccafb 100644 --- a/git-ignore-find2merge.sh +++ b/git-ignore-find2merge.sh @@ -26,20 +26,20 @@ else fi echo "" -echo "=== Enter [path to .gitignore.global.txt] or [leave blank] for default [[`pwd`]]" +echo "=== Enter [path to .gitignore.global.txt] or [leave blank] for default [[https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/.gitignore.global.txt]]" read -p ">>> " IGNOREPATH if [ "$IGNOREPATH" ] then IGNOREPATH=$(realpath $IGNOREPATH)/.gitignore.global.txt + if [ ! -f "$IGNOREPATH" ] + then + echo "××× Not found [[$IGNOREPATH]]. Exit now..." + exit + else + echo "√√√ IGNOREPATH = [[$IGNOREPATH]]" + fi else - IGNOREPATH=`pwd`/.gitignore.global.txt -fi -if [ ! -f "$IGNOREPATH" ] -then - echo "××× Not found [[$IGNOREPATH]]. Exit now..." - exit -else - echo "√√√ IGNOREPATH = [[$IGNOREPATH]]" + IGNOREPATH=https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/.gitignore.global.txt fi echo "" diff --git a/mac-resize-launchpad.sh b/mac-resize-launchpad.sh new file mode 100644 index 0000000..fb66b5d --- /dev/null +++ b/mac-resize-launchpad.sh @@ -0,0 +1,19 @@ +echo === Enter [row number] (7 for MBA, 9 for iMac) or [leave blank] for default to 9 +read -p ">>> " ROWS +if [ "$ROWS" = "" ] +then + ROWS = 9 +fi +defaults write com.apple.dock springboard-rows -int $ROWS + +echo === Enter [column number] (10 for MBA, 15 for iMac) or [leave blank] for default to 15 +read -p ">>> " COLS +if [ "$COLS" = "" ] +then + COLS = 15 +fi +defaults write com.apple.dock springboard-columns -int $COLS + +defaults write com.apple.dock ResetLaunchPad -bool true + +killall Dock diff --git a/nixhome/.bashrc b/nixhome/.bashrc index ac6ca0a..634c72d 100644 --- a/nixhome/.bashrc +++ b/nixhome/.bashrc @@ -137,7 +137,7 @@ then eval "$(/opt/homebrew/bin/brew shellenv)" elif [ "$(uname -m)" = "x86_64" ] && [ -f /usr/local/homebrew/bin/brew ] then - eval "$(/usr/local/homebrew/bin/brew shellenv)" + eval "$(echo $(/usr/local/homebrew/bin/brew shellenv) | sed 's#HOMEBREW_CELLAR=.*$#HOMEBREW_CELLAR=/usr/local/Cellar#')" fi fi diff --git a/nixhome/seafile-ignore.global.txt b/nixhome/seafile-ignore.global.txt index 7c60b3e..6795407 100644 --- a/nixhome/seafile-ignore.global.txt +++ b/nixhome/seafile-ignore.global.txt @@ -10,9 +10,13 @@ # 自定义的后缀名,凡有 sfignore 后缀的都不进行同步 *.sfignore -*.sfignore.* *.sfignore/ +*.sfignore.* *.sfignore.*/ +*.sfomit +*.sfomit.* +*.sfomit/ +*.sfomit.*/ .DS_Store */.DS_Store diff --git a/seafile-ignore-find2merge.bat b/seafile-ignore-find2merge.bat index bb3d7d9..b2da6e6 100644 --- a/seafile-ignore-find2merge.bat +++ b/seafile-ignore-find2merge.bat @@ -23,19 +23,19 @@ if not exist "%ROOTPATH%" ( echo √√√ ROOTPATH = [[%ROOTPATH%]] ) -echo === Enter [path to seafile-ignore.global.txt] or [leave blank] for default [[%CD%]] +echo === Enter [path to seafile-ignore.global.txt] or [leave blank] for default [[https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/seafile-ignore.global.txt]] set /p IGNOREPATH=">>> " echo; if "" == "%IGNOREPATH%" ( - set IGNOREPATH=%CD%/seafile-ignore.global.txt + set IGNOREPATH=https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/seafile-ignore.global.txt ) else ( for %P in (%IGNOREPATH%) do set "IGNOREPATH=%~dpnxP/seafile-ignore.global.txt" -) -if not exist "%IGNOREPATH%" ( - echo ××× [[%IGNOREPATH%]] not exist! Exit now. *** - @ GOTO END -) else ( - echo √√√ IGNOREPATH = [[%IGNOREPATH%]] + if not exist "%IGNOREPATH%" ( + echo ××× [[%IGNOREPATH%]] not exist! Exit now. *** + @ GOTO END + ) else ( + echo √√√ IGNOREPATH = [[%IGNOREPATH%]] + ) ) pushd %ROOTPATH% diff --git a/seafile-ignore-find2merge.sh b/seafile-ignore-find2merge.sh index 8281211..d1dd354 100644 --- a/seafile-ignore-find2merge.sh +++ b/seafile-ignore-find2merge.sh @@ -26,20 +26,20 @@ else fi echo "" -echo "=== Enter [path to seafile-ignore.global.txt] or [leave blank] for default [[`pwd`]]" +echo "=== Enter [path to seafile-ignore.global.txt] or [leave blank] for default [[https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/seafile-ignore.global.txt]]" read -p ">>> " IGNOREPATH if [ "$IGNOREPATH" ] then IGNOREPATH=$(realpath $IGNOREPATH)/seafile-ignore.global.txt + if [ ! -f "$IGNOREPATH" ] + then + echo "××× Not found [[$IGNOREPATH]]. Exit now..." + exit + else + echo "√√√ IGNOREPATH = [[$IGNOREPATH]]" + fi else - IGNOREPATH=`pwd`/seafile-ignore.global.txt -fi -if [ ! -f "$IGNOREPATH" ] -then - echo "××× Not found [[$IGNOREPATH]]. Exit now..." - exit -else - echo "√√√ IGNOREPATH = [[$IGNOREPATH]]" + IGNOREPATH=https://git.faronear.org/npm/sysconfig/raw/branch/main/nixhome/seafile-ignore.global.txt fi echo ""