From 4816fc38941f8715d838143edbd6b897566a5a8b Mon Sep 17 00:00:00 2001 From: MaNan Date: Wed, 15 Apr 2026 15:44:24 +0800 Subject: [PATCH] Add initial project files including .gitattributes, .gitignore, and configuration for Obsidian --- .gitattributes | 130 +++++++++++++++++++++++++++++++++ .gitignore | 14 ++++ .obsidian/app.json | 22 ++++++ .obsidian/snippets/omoolab.css | 30 ++++++++ README.md | 1 + notes/git.md | 76 +++++++++++++++++++ notes/starter.md | 48 ++++++++++++ 7 files changed, 321 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .obsidian/app.json create mode 100644 .obsidian/snippets/omoolab.css create mode 100644 README.md create mode 100644 notes/git.md create mode 100644 notes/starter.md diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..2b466ce --- /dev/null +++ b/.gitattributes @@ -0,0 +1,130 @@ +# Define macros (only works in top-level gitattributes files) +[attr]lfs filter=lfs diff=lfs merge=lfs -text + +# 3D models +*.collada lfs +*.dae lfs +*.dxf lfs +*.FBX lfs +*.fbx lfs +*.jas lfs +*.lws lfs +*.lxo lfs +*.obj lfs +*.ply lfs +*.skp lfs +*.stl lfs +*.stp lfs +*.usd lfs +*.usda lfs +*.usdc lfs +*.usdz lfs +*.glb lfs +*.gltf lfs + +# Audio +*.aif lfs +*.aiff lfs +*.it lfs +*.mod lfs +*.mp3 lfs +*.ogg lfs +*.s3m lfs +*.wav lfs +*.xm lfs + +# Video +*.asf lfs +*.avi lfs +*.flv lfs +*.mov lfs +*.mp4 lfs +*.mpeg lfs +*.mpg lfs +*.ogv lfs +*.wmv lfs +*.mkv lfs + +# Images +*.bmp lfs +*.exr lfs +*.gif lfs +*.hdr lfs +*.iff lfs +*.jpeg lfs +*.jpg lfs +*.pict lfs +*.png lfs +*.psd lfs +*.tga lfs +*.tif lfs +*.tiff lfs +*.webp lfs + +# Compressed Archive +*.7z lfs +*.bz2 lfs +*.gz lfs +*.rar lfs +*.tar lfs +*.zip lfs + +# Compiled Dynamic Library +*.dll lfs +*.pdb lfs +*.so lfs + +# Fonts +*.otf lfs +*.ttf lfs +*.woff lfs +*.woff2 lfs + +# Executable/Installer +*.apk lfs +*.exe lfs + +# Documents +*.pdf lfs +*.doc lfs +*.xls lfs +*.ppt lfs +*.docx lfs +*.xlsx lfs +*.pptx lfs + +# Adobe +*.psd lfs +*.ai lfs +*.aep lfs +*.prproj lfs +*.spp lfs + +# Zbrush +*.zbr lfs +*.zpr lfs +*.ztl lfs +*.c4d lfs + +# Autodesk +*.max lfs +*.ma lfs +*.mb lfs +*.3dm lfs +*.3ds lfs + +# Blender +*.blend lfs +*.blend1 lfs +*.c4d lfs + +# Imaging +*.dicom lfs +*.dcm lfs +*.nii lfs +*.ome lfs +*.map lfs +*.mrc lfs + +notes/assets/*.png -lfs +notes/assets/*.jpeg -lfs \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7aa130a --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# claude +.claudian + +# obsidian setting +.obsidian/* +!.obsidian/snippets +!.obsidian/app.json + +# tempary files +temp +sandbox.* + +# blender +*.blend1 \ No newline at end of file diff --git a/.obsidian/app.json b/.obsidian/app.json new file mode 100644 index 0000000..6131b68 --- /dev/null +++ b/.obsidian/app.json @@ -0,0 +1,22 @@ +{ + "showInlineTitle": false, + "useMarkdownLinks": true, + "pdfExportSettings": { + "pageSize": "Letter", + "landscape": false, + "margin": "0", + "downscalePercent": 100 + }, + "userIgnoreFilters": [ + "notes/assets/" + ], + "showUnsupportedFiles": true, + "attachmentFolderPath": "notes/assets", + "livePreview": true, + "showIndentGuide": false, + "alwaysUpdateLinks": true, + "openBehavior": "file:OMOOSPACE", + "newFileLocation": "folder", + "newFileFolderPath": "Notes", + "newLinkFormat": "absolute" +} \ No newline at end of file diff --git a/.obsidian/snippets/omoolab.css b/.obsidian/snippets/omoolab.css new file mode 100644 index 0000000..92c8a0d --- /dev/null +++ b/.obsidian/snippets/omoolab.css @@ -0,0 +1,30 @@ +/* not show label in canvas */ +.canvas-node-label { + display: none; +} + +.canvas-node-container:hover + .canvas-node-label { + display: inherit; +} + +/* image caption */ +.image-embed { + flex-wrap: wrap; +} + +.image-embed[alt]:after { + content: attr(alt); + display: block; + padding-bottom: 12px; + line-height: 2.0; + font-style: italic; + color: var(--text-faint); + text-align: center; + width: 100%; +} + + +/* fix image in canvas */ +.image-embed { + padding: 0; +} \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..f9b8fbb --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# 偶魔数字 OmooLab \ No newline at end of file diff --git a/notes/git.md b/notes/git.md new file mode 100644 index 0000000..5a793f7 --- /dev/null +++ b/notes/git.md @@ -0,0 +1,76 @@ +## 从自己的分支开始 + +1. 拉取分支 + +```bash +git clone [repo.git] +cd [repo-name] +``` + +2. 创建自己的分支 + +```bash +git checkout -b [your-name]/[do-something] # 比如 manan/dev +``` + +3. 首次推送分支到远程 + +```bash +git push -u origin [branch-name] +``` + +4. 本地一些改动 + +```bash +git add . +git commit -m [message] +``` + +5. 推送改动 + +```bash +git push +``` + +## 合并到`main` + +确保自己的东西和`main`别差太远了，合并前，先从`main`来取并合并到自己的分支 + +```bash +git checkout main +git pull # origin main +git checkout [branch-name] # 回到特征分支 +git merge main +``` + +或者直接 + +```bash +# 确保在特征分支 +git pull origin main +``` + +如果冲突，会进入`([branch-name]|MERGING)` 状态 + +解决完冲突后，继续 + +```bash +git merge --continue +``` + +大文件处理完合并后，变成指针文件，这时候用下面指令拉回 + +```bash +git lfs pull +``` + +或者退出，不解决 + +```bash +git merge --abort +``` +取消曾经追踪过的文件，但不删除文件 + +```bash +git rm --cached [file] +``` \ No newline at end of file diff --git a/notes/starter.md b/notes/starter.md new file mode 100644 index 0000000..fbd18cd --- /dev/null +++ b/notes/starter.md @@ -0,0 +1,48 @@ +1. 安装 Git +打开 windows powershell，运行 +```powershell +winget install Git.Git +``` + +安装完毕后，所有终端我们都选择 Git Bash + +设置本设备 git 的身份信息 +```bash +git config --global user.name [your-name] +git config --global user.email  [your-email] +``` + +初始化 lfs 以获取对大文件的支持 +```bash +git lfs install +``` + +2. 安装 VS Code +```bash +winget install vscode +``` + +4. 安装 Volta +```bash +winget install Volta.Volta +``` + +重启终端，安装 node + +```bash +volta install node +``` + +5. 安装 claude code +```bash +volta install @anthropic-ai/claude-code +``` + +（可选）安装 cc-switch +https://github.com/farion1231/cc-switch/releases + +（可选）安装 vscode claude 插件 +https://code.claude.com/docs/zh-CN/vs-code + +（可选）安装 obsidian claude 插件 +https://github.com/YishenTu/claudian/releases \ No newline at end of file