Compare commits

...

3 Commits

Author SHA1 Message Date
cyy_compute
b0fe524172 vault backup: 2026-05-08 19:18:23 2026-05-08 19:18:23 +08:00
cyy_compute
13a44eeb3f vault backup: 2026-05-08 19:18:10 2026-05-08 19:18:10 +08:00
cyy_compute
981c613adf vault backup: 2026-05-08 19:18:04 2026-05-08 19:18:04 +08:00
11 changed files with 42 additions and 103 deletions

View File

@@ -4,39 +4,20 @@
"type": "split",
"children": [
{
"id": "bfb010d934f3da16",
"id": "1c72877cb7f8755b",
"type": "tabs",
"children": [
{
"id": "ee6712e4bb96f904",
"id": "bc07dc427c0ed51e",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "零碎的知识/clould code.md",
"mode": "source",
"source": false
},
"type": "empty",
"state": {},
"icon": "lucide-file",
"title": "clould code"
}
},
{
"id": "3479f3b53db7721e",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "conflict-files-obsidian-git"
"title": "新标签页"
}
}
],
"currentTab": 1
]
}
],
"direction": "vertical"
@@ -68,7 +49,7 @@
"state": {
"type": "search",
"state": {
"query": "claude",
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
@@ -89,12 +70,11 @@
"title": "书签"
}
}
],
"currentTab": 1
]
}
],
"direction": "horizontal",
"width": 215.5
"width": 299.5
},
"right": {
"id": "6885019000198f8c",
@@ -110,7 +90,6 @@
"state": {
"type": "backlink",
"state": {
"file": "零碎的知识/嵌入式实验室设备使用指南.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@@ -120,7 +99,7 @@
"unlinkedCollapsed": true
},
"icon": "links-coming-in",
"title": "嵌入式实验室设备使用指南 的反向链接列表"
"title": "反向链接"
}
},
{
@@ -197,53 +176,52 @@
"pdf-plus:PDF++: Toggle auto-paste": false
}
},
"active": "3479f3b53db7721e",
"active": "8e9bf87d81cab358",
"lastOpenFiles": [
"零碎的知识/clould code.md",
"conflict-files-obsidian-git.md",
"未命名 5.base",
"未命名 3.base",
"未命名 1.base",
"未命名.base",
"未命名 4.base",
"未命名 2.base",
"零碎的知识/手机tmux.md",
"个人日记/未命名.md",
"零碎的知识/clould code.md",
"个人总纲和进度监督/DEADLINE.md",
"零碎的知识/git备忘.md",
"fusion实验记录/实验对比.md",
"fusion实验记录/~$260225实验验记录.xlsx",
"fusion实验记录/如何做科研.md",
"超级备忘/课内备忘/Pasted image 20260313115708.png",
"超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg",
"超级备忘/课内备忘/课表.md",
"超级备忘/课内备忘/微信图片_20260320233205_9_4.jpg",
"个人日记/未命名.md",
"超级备忘/机器学习/机器视觉.md",
"超级备忘/课内备忘/微信图片_20260320233206_10_4.jpg",
"考研/math/27张宇基础30讲高数.pdf",
"考研/math/002_第1讲.md",
"考研/math/file_other/27张宇基础30讲高数.webp",
"考研/math/file_other",
"考研/math/001_前言.md",
"考研/math/002_第1讲.md",
"考研/math/003_第2讲.md",
"考研/math/001_前言.md",
"考研/math/004_第3讲.md",
"考研/math/009_第8讲.md",
"考研/math/012_第11讲.md",
"考研/math/014_第13讲.md",
"考研/math/015_第13讲.md",
"考研/math/018_第17讲.md",
"考研/math/020_第18讲.md",
"27张宇基础30讲高数.webp",
"27张宇基础30讲高数 2.webp",
"27张宇基础30讲高数 1.webp",
"考研/math/002_## 第1讲.md",
"考研/math/019_第17讲.md",
"考研/math/017_第15讲.md",
"考研/math/016_第14讲.md",
"考研/math/015_第13讲.md",
"考研/math/014_第13讲.md",
"考研/math/013_第12讲.md",
"考研/math/012_第11讲.md",
"考研/math/011_第10讲.md",
"考研/math/010_第9讲.md",
"考研/math/008_第7讲.md",
"考研/math/007_第6讲.md",
"考研/math/006_第5讲.md",
"考研/math/005_第4讲.md",
"考研/math/004_第3讲.md",
"27张宇基础30讲高数 2.webp",
"27张宇基础30讲高数 1.webp",
"27张宇基础30讲高数.webp",
"考研/math/images/ffe49e27b1b256b4ec3b2fbedea04d2fb03456e81ba1014de7f0487742a5d215.jpg",
"考研/math/images/ff7f771402b6f05b26429dd7004f8b6a8d08a57870152dcfb1266bd6164d296a.jpg",
"考研/math/images/ff51cc6f212b981a350e11dd61fb39549e36ca80e7ce382b60ca72240426c184.jpg",
"考研/math/images",
"考研/math",
"考研",
"未命名.base",
"未命名 3.base",
"未命名 2.base"
"考研/math/images"
]
}

View File

@@ -1,17 +0,0 @@
# Conflicts
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
(This file will automatically be deleted before commit)
[[#Additional Instructions]] available below file list
- Not a file: .obsidian/workspace.json
# Additional Instructions
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
```diff
<<<<<<< HEAD
File changes in local repository
=======
File changes in remote repository
>>>>>>> origin/main
```

View File

@@ -17,6 +17,10 @@
| 数据图像处理实验报告 | |
| 传感器报告 | |
| 学业认定 | |
| 激光原理作业 | |
| 传感器作业 | |
| 传感器大作业 | |
| 机器视觉实验报告 | |
## 大创

View File

@@ -1,3 +0,0 @@
views:
- type: table
name: 表格

View File

@@ -1,3 +0,0 @@
views:
- type: table
name: 表格

View File

@@ -1,3 +0,0 @@
views:
- type: table
name: 表格

View File

@@ -1,3 +0,0 @@
views:
- type: table
name: 表格

View File

@@ -1,3 +0,0 @@
views:
- type: table
name: 表格

View File

@@ -1,3 +0,0 @@
views:
- type: table
name: 表格

View File

@@ -131,13 +131,7 @@ claude
在.clude.json中加入
"skipWebFetchPreflight": true
# 通过npm安装
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
# linux通过npm安装
```
which node
@@ -162,8 +156,3 @@ which npm
npm install -g @anthropic-ai/claude-code
claude --version
```
nvm install 20/
nvm use 20/
nvm alias default 20
npm install -g @anthropic-ai/claude-code

View File

@@ -0,0 +1,3 @@
pkg install proot-distro && proot-distro install ubuntu && proot-distro login ubuntu
bash -c "$(curl -fsSL https://astrbot.app/termux.sh)"