From 8d46925b6d1f9b598a359ff34c6b8c05aadc7985 Mon Sep 17 00:00:00 2001
From: windyboy <windyboy@gmail.com>
Date: Fri, 9 Jan 2026 10:07:40 +0800
Subject: [PATCH 1/2] Merge remote changes and resolve conflicts

---
 .claude/settings.json | 4 ++--
 .obsidian/graph.json  | 2 +-
 新路径/新文件名.md    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 新路径/新文件名.md

diff --git a/.claude/settings.json b/.claude/settings.json
index 1946cc2..62978a4 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -38,10 +38,10 @@
       "Remove-Partition"
     ]
   },
-  "model": "sonnet",
+  "model": "haiku",
   "enableAutoTitleGeneration": true,
   "titleGenerationModel": "",
-  "thinkingBudget": "low",
+  "thinkingBudget": "off",
   "permissionMode": "normal",
   "lastNonPlanPermissionMode": "normal",
   "permissions": [
diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index e21a18d..42a46ec 100644
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -18,5 +18,5 @@
   "linkStrength": 1,
   "linkDistance": 250,
   "scale": 1,
-  "close": false
+  "close": true
 }
\ No newline at end of file
diff --git a/新路径/新文件名.md b/新路径/新文件名.md
new file mode 100644
index 0000000..54c3df6
--- /dev/null
+++ b/新路径/新文件名.md
@@ -0,0 +1 @@
+模板名
\ No newline at end of file

From 13b6521e1cf8e9fc8f7cf8fae584b1215695c3f7 Mon Sep 17 00:00:00 2001
From: windyboy <windyboy@gmail.com>
Date: Fri, 9 Jan 2026 10:58:27 +0800
Subject: [PATCH 2/2] vault backup: 2026-01-09 10:58:27

---
 .claude/mcp.json | 17 -----------------
 .gitignore       | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 .claude/mcp.json

diff --git a/.claude/mcp.json b/.claude/mcp.json
deleted file mode 100644
index 53b481d..0000000
--- a/.claude/mcp.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "mcpServers": {
-    "memvid": {
-      "command": "uv",
-      "args": [
-        "run",
-        "--directory",
-        "D:\\\\works\\\\projects-windows\\\\memvid-agent-mcp",
-        "memvid_mcp_server.py"
-      ],
-      "env": {
-        "PYTHONUNBUFFERED": "1",
-        "MEMVID_LOG_LEVEL": "INFO"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a7da372..f7f6535 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,18 @@
 # Obsidian Sync
 .obsidian/sync-config.json
 
+# Machine-specific Obsidian configuration (auto-generated, varies per user)
+.obsidian/backlink.json
+.obsidian/community-plugins.json
+.obsidian/core-plugins.json
+.obsidian/daily-notes.json
+.obsidian/graph.json
+.obsidian/types.json
+
+# Plugin and theme manifest files (auto-generated metadata)
+.obsidian/plugins/*/manifest.json
+.obsidian/themes/*/manifest.json
+
 # Optional: Uncomment if you don't want to sync themes and snippets
 # .obsidian/themes/
 # .obsidian/snippets/
@@ -219,3 +231,6 @@ coverage/
 
 # Build script generated files
 FIRST_RUN_COMPLETED
+
+#MCP
+.claude/mcp.json