From 07883fc8647da2292af1982b3c5bbd00a81acc0f Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Fri, 19 Aug 2022 22:49:50 +0800
Subject: [PATCH] u

---
 git-config.sh      | 31 ++++++++++++----------
 nixhome/.gitignore | 64 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/git-config.sh b/git-config.sh
index 3436fb1..ad2f80e 100755
--- a/git-config.sh
+++ b/git-config.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 echo "---------------------------------------------"
-read -p "User Name (leave blank for no change) >>> " UserName
+echo "User Name (leave blank for no change)" 
+read -p ">>> " UserName
 if [ $UserName ]
 then
   echo "git config --global user.name $UserName"
@@ -9,7 +10,8 @@ then
 fi
 
 echo "---------------------------------------------"
-read -p "User Email (leave blank for no change) >>> " UserEmail
+echo "User Email (leave blank for no change)" 
+read -p ">>> " UserEmail
 if [ $UserEmail ]
 then
   echo "git config --global user.email $UserEmail"
@@ -18,7 +20,8 @@ fi
 
 echo "---------------------------------------------"
 echo "如果 git 远程服务器的 ssl 证书过期，或者使用了自颁发的证书，连接时会出现验证错误 Cannot verify local issuer"
-read -p "Verify ssl? (true or false, blank for no change) >> " HttpSslVerify
+echo "Verify ssl? (true or false, blank for no change)" 
+read -p ">>> " HttpSslVerify
 if [ $HttpSslVerify ]
 then
   echo "git config --global http.sslVerify $HttpSslVerify"
@@ -26,7 +29,8 @@ then
 fi
 
 echo "---------------------------------------------"
-read -p "Store credential in cache or store? (leave blank for no change) >> " CredentialHelper
+echo "Store credential in cache or store? (leave blank for no change)" 
+read -p ">>> " CredentialHelper
 if [ $CredentialHelper ]
 then
   echo "git config --global credential.helper $CredentialHelper"
@@ -34,22 +38,21 @@ then
 fi
 
 echo "---------------------------------------------"
-read -p "Path to global gitignore file? (For example ~/.gitignore, leave blank for no change) >> " ExcludesFile
+echo "Path to global gitignore file? (For example ~/.gitignore, leave blank for no change)"
+read -p ">>> " ExcludesFile
 if [ $ExcludesFile ]
 then
-  if [ -e $ExcludesFile ]
-  then
-    echo "git config --global core.excludesfile $ExcludesFile"
-    git config --global core.excludesfile $ExcludesFile
-  else
-    echo "File not exsit: $ExcludesFile"
-  fi
+  echo "git config --global core.excludesfile $ExcludesFile"
+  git config --global core.excludesfile $ExcludesFile
+else
+  echo "File not exsit: $ExcludesFile"
 fi
 
 echo "---------------------------------------------"
-read -p "Set default branch since git 2.28 to master or main? (leave blank for no change) >> " DefaultBranch
+echo "Set default branch since git 2.28 to master or main? (leave blank for no change)"
+read -p ">>> " DefaultBranch
 if [ $DefaultBranch ]
 then
   echo "git config --global init.defaultbranch $DefaultBranch"
   git config --global init.defaultbranch $DefaultBranch
-fi
\ No newline at end of file
+fi
diff --git a/nixhome/.gitignore b/nixhome/.gitignore
index e3e4e9f..1f76c5d 100644
--- a/nixhome/.gitignore
+++ b/nixhome/.gitignore
@@ -1,26 +1,58 @@
-.DS_Store
-Thumbs.db
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
 node_modules/
+/test/unit/coverage/
+/test/e2e/reports/
+.svn/
+.idea/
+.sass-cache/
+.deploy_git/
+.gitattributes
+_desktop.ini
+.DS_Store
+.thumbnails
+Thumbs.db
+thumbs.db
+.umi
+.umi-production
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-/test/unit/coverage/
-/test/e2e/reports/
 selenium-debug.log
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
+package-lock.json
+*.iml
 *.njsproj
+*.ntvs*
 *.sln
-/package-lock.json
-
-# Microsoft Office temporary files
+*.suo
+._*
+.$*
 ~$*
 
-# seafile temporary files
-._*
-
 .bashrc_custom
+
+# hexo
+db.json
+
+# 客户端 uniapp 项目
+/unpackage/dist
+/unpackage/release
+/unpackage/cache
+/_archive/*
+/_datastore/*
+/_logstore/*
+/_filestore/*
+*.apk
+/pages4loader.json5
+envar-web-custom.js
+envar-deploy-secret.js
+
+# hexo 项目
+public/
+
+# 服务端(server or uniapp-uniCloud)项目
+envar-base-custom.js
+envar-base-dynamic.js
+envar-base-secret.js
+
+!.gitkeep