From 6d6b7e0f36e0d56f93346d0add31dd78bbb69323 Mon Sep 17 00:00:00 2001 From: jonathan Date: Sat, 25 Feb 2023 23:30:52 +1030 Subject: [PATCH] vault backup: 2023-02-25 23:30:52 --- .obsidian/.syncthing.app.json.tmp | 3 + .../.syncthing.community-plugins.json.tmp | 4 + ....syncthing.core-plugins-migration.json.tmp | 29 +++ .obsidian/.syncthing.core-plugins.json.tmp | 20 +++ .obsidian/.syncthing.hotkeys.json.tmp | 1 + .obsidian/app.json | 4 +- ...sync-conflict-20230225-232528-LQLG4DZ.json | 3 + ...sync-conflict-20230225-232529-LQLG4DZ.json | 3 + .obsidian/community-plugins.json | 3 +- ...sync-conflict-20230225-232528-LQLG4DZ.json | 4 + ...sync-conflict-20230225-232529-LQLG4DZ.json | 4 + .../obsidian-git/.syncthing.data.json.tmp | 27 +++ .obsidian/plugins/obsidian-git/data.json | 6 +- ...sync-conflict-20230225-232528-LQLG4DZ.json | 27 +++ ...sync-conflict-20230225-232529-LQLG4DZ.json | 27 +++ .obsidian/workspace-mobile.json | 169 ++++++++++++++++++ 16 files changed, 326 insertions(+), 8 deletions(-) create mode 100644 .obsidian/.syncthing.app.json.tmp create mode 100644 .obsidian/.syncthing.community-plugins.json.tmp create mode 100644 .obsidian/.syncthing.core-plugins-migration.json.tmp create mode 100644 .obsidian/.syncthing.core-plugins.json.tmp create mode 100644 .obsidian/.syncthing.hotkeys.json.tmp create mode 100644 .obsidian/app.sync-conflict-20230225-232528-LQLG4DZ.json create mode 100644 .obsidian/app.sync-conflict-20230225-232529-LQLG4DZ.json create mode 100644 .obsidian/community-plugins.sync-conflict-20230225-232528-LQLG4DZ.json create mode 100644 .obsidian/community-plugins.sync-conflict-20230225-232529-LQLG4DZ.json create mode 100644 .obsidian/plugins/obsidian-git/.syncthing.data.json.tmp create mode 100644 .obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232528-LQLG4DZ.json create mode 100644 .obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232529-LQLG4DZ.json create mode 100644 .obsidian/workspace-mobile.json diff --git a/.obsidian/.syncthing.app.json.tmp b/.obsidian/.syncthing.app.json.tmp new file mode 100644 index 0000000..78be447 --- /dev/null +++ b/.obsidian/.syncthing.app.json.tmp @@ -0,0 +1,3 @@ +{ + "showUnsupportedFiles": true +} \ No newline at end of file diff --git a/.obsidian/.syncthing.community-plugins.json.tmp b/.obsidian/.syncthing.community-plugins.json.tmp new file mode 100644 index 0000000..193160c --- /dev/null +++ b/.obsidian/.syncthing.community-plugins.json.tmp @@ -0,0 +1,4 @@ +[ + "obsidian-git", + "obsidian-editor-shortcuts" +] \ No newline at end of file diff --git a/.obsidian/.syncthing.core-plugins-migration.json.tmp b/.obsidian/.syncthing.core-plugins-migration.json.tmp new file mode 100644 index 0000000..3106ebd --- /dev/null +++ b/.obsidian/.syncthing.core-plugins-migration.json.tmp @@ -0,0 +1,29 @@ +{ + "file-explorer": true, + "global-search": true, + "switcher": true, + "graph": true, + "backlink": true, + "canvas": true, + "outgoing-link": true, + "tag-pane": true, + "page-preview": true, + "daily-notes": true, + "templates": true, + "note-composer": true, + "command-palette": true, + "slash-command": false, + "editor-status": true, + "starred": true, + "markdown-importer": false, + "zk-prefixer": false, + "random-note": false, + "outline": true, + "word-count": true, + "slides": false, + "audio-recorder": false, + "workspaces": false, + "file-recovery": true, + "publish": false, + "sync": false +} \ No newline at end of file diff --git a/.obsidian/.syncthing.core-plugins.json.tmp b/.obsidian/.syncthing.core-plugins.json.tmp new file mode 100644 index 0000000..086a8e4 --- /dev/null +++ b/.obsidian/.syncthing.core-plugins.json.tmp @@ -0,0 +1,20 @@ +[ + "file-explorer", + "global-search", + "switcher", + "graph", + "backlink", + "canvas", + "outgoing-link", + "tag-pane", + "page-preview", + "daily-notes", + "templates", + "note-composer", + "command-palette", + "editor-status", + "starred", + "outline", + "word-count", + "file-recovery" +] \ No newline at end of file diff --git a/.obsidian/.syncthing.hotkeys.json.tmp b/.obsidian/.syncthing.hotkeys.json.tmp new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/.obsidian/.syncthing.hotkeys.json.tmp @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/.obsidian/app.json b/.obsidian/app.json index 78be447..9e26dfe 100644 --- a/.obsidian/app.json +++ b/.obsidian/app.json @@ -1,3 +1 @@ -{ - "showUnsupportedFiles": true -} \ No newline at end of file +{} \ No newline at end of file diff --git a/.obsidian/app.sync-conflict-20230225-232528-LQLG4DZ.json b/.obsidian/app.sync-conflict-20230225-232528-LQLG4DZ.json new file mode 100644 index 0000000..78be447 --- /dev/null +++ b/.obsidian/app.sync-conflict-20230225-232528-LQLG4DZ.json @@ -0,0 +1,3 @@ +{ + "showUnsupportedFiles": true +} \ No newline at end of file diff --git a/.obsidian/app.sync-conflict-20230225-232529-LQLG4DZ.json b/.obsidian/app.sync-conflict-20230225-232529-LQLG4DZ.json new file mode 100644 index 0000000..78be447 --- /dev/null +++ b/.obsidian/app.sync-conflict-20230225-232529-LQLG4DZ.json @@ -0,0 +1,3 @@ +{ + "showUnsupportedFiles": true +} \ No newline at end of file diff --git a/.obsidian/community-plugins.json b/.obsidian/community-plugins.json index 193160c..d3f66fa 100644 --- a/.obsidian/community-plugins.json +++ b/.obsidian/community-plugins.json @@ -1,4 +1,3 @@ [ - "obsidian-git", - "obsidian-editor-shortcuts" + "obsidian-git" ] \ No newline at end of file diff --git a/.obsidian/community-plugins.sync-conflict-20230225-232528-LQLG4DZ.json b/.obsidian/community-plugins.sync-conflict-20230225-232528-LQLG4DZ.json new file mode 100644 index 0000000..193160c --- /dev/null +++ b/.obsidian/community-plugins.sync-conflict-20230225-232528-LQLG4DZ.json @@ -0,0 +1,4 @@ +[ + "obsidian-git", + "obsidian-editor-shortcuts" +] \ No newline at end of file diff --git a/.obsidian/community-plugins.sync-conflict-20230225-232529-LQLG4DZ.json b/.obsidian/community-plugins.sync-conflict-20230225-232529-LQLG4DZ.json new file mode 100644 index 0000000..193160c --- /dev/null +++ b/.obsidian/community-plugins.sync-conflict-20230225-232529-LQLG4DZ.json @@ -0,0 +1,4 @@ +[ + "obsidian-git", + "obsidian-editor-shortcuts" +] \ No newline at end of file diff --git a/.obsidian/plugins/obsidian-git/.syncthing.data.json.tmp b/.obsidian/plugins/obsidian-git/.syncthing.data.json.tmp new file mode 100644 index 0000000..4968cd2 --- /dev/null +++ b/.obsidian/plugins/obsidian-git/.syncthing.data.json.tmp @@ -0,0 +1,27 @@ +{ + "commitMessage": "markdown file update: {{date}}", + "autoCommitMessage": "vault backup: {{date}}", + "commitDateFormat": "YYYY-MM-DD HH:mm:ss", + "autoSaveInterval": 0, + "autoPushInterval": 0, + "autoPullInterval": 0, + "autoPullOnBoot": false, + "disablePush": false, + "pullBeforePush": true, + "disablePopups": false, + "listChangedFilesInMessageBody": false, + "showStatusBar": true, + "updateSubmodules": false, + "syncMethod": "merge", + "customMessageOnAutoBackup": false, + "autoBackupAfterFileChange": false, + "treeStructure": false, + "refreshSourceControl": true, + "basePath": "", + "differentIntervalCommitAndPush": false, + "changedFilesInStatusBar": false, + "showedMobileNotice": true, + "refreshSourceControlTimer": 7000, + "showBranchStatusBar": true, + "setLastSaveToLastCommit": false +} \ No newline at end of file diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json index 4968cd2..f20705f 100644 --- a/.obsidian/plugins/obsidian-git/data.json +++ b/.obsidian/plugins/obsidian-git/data.json @@ -1,5 +1,5 @@ { - "commitMessage": "markdown file update: {{date}}", + "commitMessage": "vault backup: {{date}}", "autoCommitMessage": "vault backup: {{date}}", "commitDateFormat": "YYYY-MM-DD HH:mm:ss", "autoSaveInterval": 0, @@ -16,10 +16,10 @@ "customMessageOnAutoBackup": false, "autoBackupAfterFileChange": false, "treeStructure": false, - "refreshSourceControl": true, + "refreshSourceControl": false, "basePath": "", "differentIntervalCommitAndPush": false, - "changedFilesInStatusBar": false, + "changedFilesInStatusBar": true, "showedMobileNotice": true, "refreshSourceControlTimer": 7000, "showBranchStatusBar": true, diff --git a/.obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232528-LQLG4DZ.json b/.obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232528-LQLG4DZ.json new file mode 100644 index 0000000..4968cd2 --- /dev/null +++ b/.obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232528-LQLG4DZ.json @@ -0,0 +1,27 @@ +{ + "commitMessage": "markdown file update: {{date}}", + "autoCommitMessage": "vault backup: {{date}}", + "commitDateFormat": "YYYY-MM-DD HH:mm:ss", + "autoSaveInterval": 0, + "autoPushInterval": 0, + "autoPullInterval": 0, + "autoPullOnBoot": false, + "disablePush": false, + "pullBeforePush": true, + "disablePopups": false, + "listChangedFilesInMessageBody": false, + "showStatusBar": true, + "updateSubmodules": false, + "syncMethod": "merge", + "customMessageOnAutoBackup": false, + "autoBackupAfterFileChange": false, + "treeStructure": false, + "refreshSourceControl": true, + "basePath": "", + "differentIntervalCommitAndPush": false, + "changedFilesInStatusBar": false, + "showedMobileNotice": true, + "refreshSourceControlTimer": 7000, + "showBranchStatusBar": true, + "setLastSaveToLastCommit": false +} \ No newline at end of file diff --git a/.obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232529-LQLG4DZ.json b/.obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232529-LQLG4DZ.json new file mode 100644 index 0000000..4968cd2 --- /dev/null +++ b/.obsidian/plugins/obsidian-git/data.sync-conflict-20230225-232529-LQLG4DZ.json @@ -0,0 +1,27 @@ +{ + "commitMessage": "markdown file update: {{date}}", + "autoCommitMessage": "vault backup: {{date}}", + "commitDateFormat": "YYYY-MM-DD HH:mm:ss", + "autoSaveInterval": 0, + "autoPushInterval": 0, + "autoPullInterval": 0, + "autoPullOnBoot": false, + "disablePush": false, + "pullBeforePush": true, + "disablePopups": false, + "listChangedFilesInMessageBody": false, + "showStatusBar": true, + "updateSubmodules": false, + "syncMethod": "merge", + "customMessageOnAutoBackup": false, + "autoBackupAfterFileChange": false, + "treeStructure": false, + "refreshSourceControl": true, + "basePath": "", + "differentIntervalCommitAndPush": false, + "changedFilesInStatusBar": false, + "showedMobileNotice": true, + "refreshSourceControlTimer": 7000, + "showBranchStatusBar": true, + "setLastSaveToLastCommit": false +} \ No newline at end of file diff --git a/.obsidian/workspace-mobile.json b/.obsidian/workspace-mobile.json new file mode 100644 index 0000000..f9299f7 --- /dev/null +++ b/.obsidian/workspace-mobile.json @@ -0,0 +1,169 @@ +{ + "main": { + "id": "f45285394366f935", + "type": "split", + "children": [ + { + "id": "03f48111051ba3da", + "type": "tabs", + "children": [ + { + "id": "242bf1eef11dbc2e", + "type": "leaf", + "state": { + "type": "empty", + "state": {} + } + } + ] + } + ], + "direction": "vertical" + }, + "left": { + "id": "6f836e3d09002d5e", + "type": "mobile-drawer", + "children": [ + { + "id": "b9c2185e70c765ab", + "type": "leaf", + "state": { + "type": "file-explorer", + "state": { + "sortOrder": "alphabetical" + } + } + }, + { + "id": "159dee71922b0c74", + "type": "leaf", + "state": { + "type": "search", + "state": { + "query": "", + "matchingCase": false, + "explainSearch": false, + "collapseAll": false, + "extraContext": false, + "sortOrder": "alphabetical" + } + } + }, + { + "id": "cd1e99b293bdc6a9", + "type": "leaf", + "state": { + "type": "tag", + "state": { + "sortOrder": "frequency", + "useHierarchy": true + } + } + }, + { + "id": "1e2216a2457faf7d", + "type": "leaf", + "state": { + "type": "starred", + "state": {} + } + } + ], + "currentTab": 0 + }, + "right": { + "id": "b4231f18895d3c3c", + "type": "mobile-drawer", + "children": [ + { + "id": "3affaf09651d6c21", + "type": "leaf", + "state": { + "type": "backlink", + "state": { + "collapseAll": false, + "extraContext": false, + "sortOrder": "alphabetical", + "showSearch": false, + "searchQuery": "", + "backlinkCollapsed": false, + "unlinkedCollapsed": true + } + } + }, + { + "id": "70c60d8a71edc95d", + "type": "leaf", + "state": { + "type": "outgoing-link", + "state": { + "linksCollapsed": false, + "unlinkedCollapsed": true + } + } + }, + { + "id": "b453b6c0ee402d43", + "type": "leaf", + "state": { + "type": "outline", + "state": {} + } + } + ], + "currentTab": 0 + }, + "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 + } + }, + "active": "242bf1eef11dbc2e", + "lastOpenFiles": [ + "node_modules/hamljs/test/unit/spec.helper.js", + "node_modules/has-proto/package.json", + "node_modules/neo-async/transformLimit.js", + "node_modules/resolve/test/resolver/symlinked/package/package.json", + "node_modules/bootstrap/scss/helpers/_stacks.scss", + "node_modules/markdown-it/lib/common/utils.js", + "node_modules/normalize-package-data/lib/normalize.js", + "node_modules/es-abstract/2018/IteratorValue.js", + "node_modules/semver/preload.js", + "node_modules/es-abstract/2017/OrdinaryDefineOwnProperty.js", + "node_modules/once/package.json", + "node_modules/path-type/node_modules/pify/readme.md", + "node_modules/gopd/CHANGELOG.md", + "node_modules/luxon/LICENSE.md", + "node_modules/has/README.md", + "node_modules/@babel/helper-string-parser/README.md", + "node_modules/pug-filters/CHANGELOG.md", + "node_modules/es-abstract/README.md", + "node_modules/moo/README.md", + "src/img/l_ash02_big.jpg", + "node_modules/uglify-js/README.md", + "node_modules/esprima/README.md", + "node_modules/promise-each/README.md", + "node_modules/glob/README.md", + "node_modules/hamljs/Readme.md", + "node_modules/has-tostringtag/CHANGELOG.md", + "node_modules/npm-run-all/node_modules/cross-spawn/README.md", + "node_modules/which-typed-array/CHANGELOG.md", + "node_modules/js-yaml/README.md", + "node_modules/object.assign/README.md", + "node_modules/path-key/readme.md", + "node_modules/strip-bom/readme.md", + "node_modules/htmlparser2/README.md", + "node_modules/memorystream/README.md", + "node_modules/npm-run-all/docs/run-p.md", + "node_modules/list-to-array/README.md", + "node_modules/is-decimal/readme.md", + "public/img/cropped.png", + "public/img/l_ash02_big.jpg", + "src/img/cropped.png" + ] +} \ No newline at end of file