From 634324f67f98fa359de5403cdc4789401e8af1ba Mon Sep 17 00:00:00 2001 From: thad-w541 Date: Tue, 28 Oct 2025 21:57:19 -0500 Subject: [PATCH] yay no more conflicts please! --- .obsidian/app.json | 12 -- .obsidian/appearance.json | 16 --- .obsidian/workspace.json | 286 -------------------------------------- Shop/SHOP-PUNCHLIST.md | 2 +- 4 files changed, 1 insertion(+), 315 deletions(-) delete mode 100644 .obsidian/app.json delete mode 100644 .obsidian/appearance.json delete mode 100644 .obsidian/workspace.json diff --git a/.obsidian/app.json b/.obsidian/app.json deleted file mode 100644 index f750640..0000000 --- a/.obsidian/app.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "promptDelete": false, - "alwaysUpdateLinks": true, - "pdfExportSettings": { - "includeName": true, - "pageSize": "Letter", - "landscape": false, - "margin": "0", - "downscalePercent": 100 - }, - "showInlineTitle": true -} \ No newline at end of file diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json deleted file mode 100644 index bec5687..0000000 --- a/.obsidian/appearance.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "accentColor": "#6b6b6b", - "baseFontSize": 15, - "textFontFamily": "Gentium Book Plus,Baskerville,DejaVu Serif", - "interfaceFontFamily": "Gentium Book Plus,Baskerville,DejaVu Serif", - "theme": "obsidian", -<<<<<<< HEAD - "cssTheme": "Material Gruvbox", -======= - "cssTheme": "dark gruvbox", ->>>>>>> b054a46a01eaba7303abbc131618644c05965d75 - "baseFontSizeAction": true, - "monospaceFontFamily": "Atkinson Hyperlegible Mono,Source Code Pro", - "nativeMenus": false, - "showRibbon": false -} \ No newline at end of file diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json deleted file mode 100644 index f7ca4a1..0000000 --- a/.obsidian/workspace.json +++ /dev/null @@ -1,286 +0,0 @@ -{ - "main": { - "id": "6c068dc285404ac1", - "type": "split", - "children": [ - { -<<<<<<< HEAD - "id": "67e837316d037dc4", - "type": "tabs", - "children": [ - { - "id": "61cb747b795b9124", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "29OCT2025.md", - "mode": "source", - "source": false - }, - "icon": "lucide-file", - "title": "29OCT2025" - } - }, - { - "id": "69c870afe5808750", -======= - "id": "b488fa5ce7860fda", - "type": "tabs", - "children": [ - { - "id": "0e37fc83d4cab986", ->>>>>>> b054a46a01eaba7303abbc131618644c05965d75 - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "28OCT2025.md", - "mode": "source", - "source": false - }, - "icon": "lucide-file", - "title": "28OCT2025" - } - }, - { - "id": "b07d58cd0406189f", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "28OCT2025.md", - "mode": "source", - "source": false - }, - "icon": "lucide-file", - "title": "28OCT2025" - } - } - ], -<<<<<<< HEAD - "currentTab": 1, - "stacked": true -======= - "currentTab": 1 ->>>>>>> b054a46a01eaba7303abbc131618644c05965d75 - } - ], - "direction": "vertical" - }, - "left": { - "id": "e2c6b4ed9e287430", - "type": "split", - "children": [ - { - "id": "ff38179c44fc6e0c", - "type": "tabs", - "children": [ - { - "id": "a21dd0f8e4b7cdfc", - "type": "leaf", - "state": { - "type": "file-explorer", - "state": { - "sortOrder": "alphabetical", - "autoReveal": false - }, - "icon": "lucide-folder-closed", - "title": "Files" - } - }, - { - "id": "b22ef90ba62b886d", - "type": "leaf", - "state": { - "type": "search", - "state": { - "query": "", - "matchingCase": false, - "explainSearch": false, - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical" - }, - "icon": "lucide-search", - "title": "Search" - } - }, - { - "id": "f870148656617fa0", - "type": "leaf", - "state": { - "type": "bookmarks", - "state": {}, - "icon": "lucide-bookmark", - "title": "Bookmarks" - } - } - ] - } - ], - "direction": "horizontal", - "width": 300 - }, - "right": { - "id": "9c20bdb19428aa15", - "type": "split", - "children": [ - { - "id": "8aaecde0849b4dd6", - "type": "tabs", - "children": [ - { - "id": "b6fb07ed7ad2405b", - "type": "leaf", - "state": { - "type": "backlink", - "state": { - "collapseAll": false, - "extraContext": false, - "sortOrder": "alphabetical", - "showSearch": false, - "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": true - }, - "icon": "links-coming-in", - "title": "Backlinks" - } - }, - { - "id": "d2031c8b2525262f", - "type": "leaf", - "state": { - "type": "outgoing-link", - "state": { - "linksCollapsed": false, - "unlinkedCollapsed": true - }, - "icon": "links-going-out", - "title": "Outgoing links" - } - }, - { - "id": "84d35efe9261f008", - "type": "leaf", - "state": { - "type": "tag", - "state": { - "sortOrder": "frequency", - "useHierarchy": true, - "showSearch": false, - "searchQuery": "" - }, - "icon": "lucide-tags", - "title": "Tags" - } - }, - { - "id": "9382d65b7548050d", - "type": "leaf", - "state": { - "type": "outline", - "state": { - "followCursor": false, - "showSearch": false, - "searchQuery": "" - }, - "icon": "lucide-list", - "title": "Outline" - } - } - ] - } - ], - "direction": "horizontal", - "width": 300, - "collapsed": true - }, - "left-ribbon": { - "hiddenItems": { - "switcher:Open quick switcher": false, - "graph:Open graph view": false, - "canvas:Create new canvas": false, - "daily-notes:Open today's daily note": false, - "templates:Insert template": false, - "command-palette:Open command palette": false, - "bases:Create new base": false, - "obsidian-focus-mode:Toggle Focus Mode (Shift + Click to show active pane only)": false, - "table-editor-obsidian:Advanced Tables Toolbar": false - } - }, -<<<<<<< HEAD - "active": "69c870afe5808750", - "lastOpenFiles": [ - "Linux reference.md", - "Habits and Orarion.md", - "THF/Ways to fix the gearbox.md", - "THF/THF-PUNCHLIST.md", - "THF/THF SW License Key.md", - "29OCT2025.md", - "Shop/SHOP-PUNCHLIST.md", - "28OCT2025.md", - "THF/THFRS-Call with Jonathan - Row Shields - 06AUG2025.md", - "THF/log.md", - "THF/Enclosures.md", - "27Oct2025.md", - "THF/51utv4Pw0sL._SL1100_.jpg", - "stockcropper/433MHz.md", - "stockcropper/Gearboxes.md", - "stockcropper/Invoice TFC 13AUG2025.pdf", - "stockcropper/Untitled.md", - "stockcropper/StockCropper Development Pitch.md", - "stockcropper/SC-SOPS.md", - "Timeclock.md", - "THF Options.md", - "stockcropper/SC-PUNCHLIST.md", - "Archive/Journal/Stovetop.md", - "Stephen's Salt Idea.md", - "Shopping List.md", - "Amazon Running Returns List.md", - "Shop/Wishlist for writerdeck.md", - "stockcropper/stockcropper.md", - "Shop", - "Untitled.base", - "Farm", - "Untitled.canvas", -======= - "active": "b07d58cd0406189f", - "lastOpenFiles": [ - "Farm/PPI-PUNCHLIST.md", - "28OCT2025.md", - "Timeclock.md", - "Stephen's Salt Idea.md", - "27Oct2025.md", - "stockcropper/Shop Rate.md", - "mxd/the damndest of apples.md", - "mxd/Ruminants Ex Deo.md", - "mxd/Ruminants Ex Deo 1.md", - "mxd/Reply to this AI worship nonsense.md", - "mxd/Reply to Kingsnorth.md", - "mxd/Reply to Kingsnorth 1.md", - "mxd/pretty iesu.md", - "mxd/MXD-PUNCHLIST.md", - "mxd/Nature-al design.md", - "mxd/Divine Light Fading.md", - "mxd/Bio-Mimickry or Bio-Mockery.md", - "mxd/Bio-Mimickry or Bio-Mockery 2.md", - "mxd/AI - Barnes, Kempf.md", - "mxd/Bio-Mimickry or Bio-Mockery 1.md", - "mxd/Bechamp, or Pasteur.md", - "mxd/A few months of shepherding.md", - "mxd/A few months of shepherding 1.md", - "mxd", - "THF/THF-PUNCHLIST.md", - "Shop/SHOP-PUNCHLIST.md", - "Shop", - "Farm/Walnut for Dewormer.md", - "Farm", ->>>>>>> b054a46a01eaba7303abbc131618644c05965d75 - "274039825309.jpeg", - "274039228009.jpeg", - "THF/Pasted image 20241130114206.png", - "THF/control-systems-CON.1609.WP.3.jpg" - ] -} \ No newline at end of file diff --git a/Shop/SHOP-PUNCHLIST.md b/Shop/SHOP-PUNCHLIST.md index 78cf385..4c59581 100644 --- a/Shop/SHOP-PUNCHLIST.md +++ b/Shop/SHOP-PUNCHLIST.md @@ -16,7 +16,7 @@ - [ ] turn on/off touchpad easily - latex / gabc? - [x] brightness fix -- [ ] custom obsidian theme i guess +- [x] custom obsidian theme i guess - [ ] st scrolling - [ ] redshift - [ ] autologin