vault backup: 2025-12-08 15:21:21

Affected files:
21.01. OS/21.01. Linux/00. 重灌基本步驟.md

21.01. OS/21.01. Linux/00. 重灌基本步驟.md

@@ -1,6 +1,3 @@
-```bash
-sudo apt update; sudo apt install -y cifs-utils lm-sensors
-```
 
 1. 安裝必須的套件
 2. 修正時區
@@ -17,6 +14,23 @@ sudo apt update; sudo apt install -y cifs-utils lm-sensors
 sudo apt update; sudo apt install -y cifs-utils lm-sensors
 sudo timedatectl set-timezone Asia/Taipei
 mkdir ~/log
-
+```
-
+
+12. 安裝 [delta](https://github.com/dandavison/delta)
+	1. Goto https://github.com/dandavison/delta/releases and download deb file.
+	2. Use `dpkg -i file.deb` to install
+	3. 修改 `~/.gitconfig`：
+		```
+		[core]
+			pager = delta
+		
+		[interactive]
+			diffFilter = delta --color-only
+		
+		[delta]
+			navigate = true  # use n and N to move between diff sections
+			dark = true      # or light = true, or omit for auto-detection
+		
+		[merge]
+			conflictStyle = zdiff3
 		```