diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 770c1eccc..569be1241 100755 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -88,6 +88,6 @@ "repelStrength": 11.7708333333333, "linkStrength": 1, "linkDistance": 160, - "scale": 0.0621977787965568, + "scale": 0.0932966681948352, "close": true } \ No newline at end of file diff --git a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json index 8a763bd33..d2475682f 100755 --- a/.obsidian/plugins/obsidian-pandoc-reference-list/data.json +++ b/.obsidian/plugins/obsidian-pandoc-reference-list/data.json @@ -5,7 +5,11 @@ { "id": 1, "name": "My Library", +<<<<<<< HEAD "lastUpdate": 1725547886214 +======= + "lastUpdate": 1725542477788 +>>>>>>> origin/master } ], "renderCitations": true, diff --git a/.obsidian/plugins/obsidian-style-settings/data.json b/.obsidian/plugins/obsidian-style-settings/data.json index efe37b833..90b0cc99d 100755 --- a/.obsidian/plugins/obsidian-style-settings/data.json +++ b/.obsidian/plugins/obsidian-style-settings/data.json @@ -3,8 +3,8 @@ "anuppuccin-theme-settings@@anuppuccin-accent-toggle": true, "anuppuccin-theme-settings-extended@@anp-theme-ext-light": true, "anuppuccin-theme-settings-extended@@anp-theme-ext-dark": true, - "anuppuccin-theme-settings-extended@@catppuccin-theme-extended": "ctp-solarized-light", - "anuppuccin-theme-settings-extended@@catppuccin-theme-dark-extended": "ctp-nord-darker", + "anuppuccin-theme-settings-extended@@catppuccin-theme-extended": "ctp-atom-light", + "anuppuccin-theme-settings-extended@@catppuccin-theme-dark-extended": "ctp-kanagawa-dark", "anuppuccin-theme-settings@@anuppuccin-theme-dark": "ctp-mocha", "anuppuccin-theme-settings@@anp-custom-checkboxes": true, "anuppuccin-theme-settings@@anp-speech-bubble": true, diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 78d11cb2f..acbc010c4 100755 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -26,9 +26,21 @@ "type": "full-calendar-view", "state": {} } + }, + { + "id": "0b0a1f5e1c951518", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "conflict-files-obsidian-git.md", + "mode": "source", + "source": false + } + } } ], - "currentTab": 1 + "currentTab": 2 } ], "direction": "vertical" @@ -114,7 +126,7 @@ "state": { "type": "backlink", "state": { - "file": "200. Library Papers/liSyntheticLagrangianTurbulence2024.md", + "file": "conflict-files-obsidian-git.md", "collapseAll": true, "extraContext": false, "sortOrder": "alphabetical", @@ -131,7 +143,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "200. Library Papers/liSyntheticLagrangianTurbulence2024.md", + "file": "conflict-files-obsidian-git.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -154,7 +166,7 @@ "state": { "type": "outline", "state": { - "file": "200. Library Papers/liSyntheticLagrangianTurbulence2024.md" + "file": "conflict-files-obsidian-git.md" } } } @@ -193,10 +205,20 @@ "obsidian-full-calendar:Open Full Calendar": false } }, - "active": "b06ed71cd3132efc", + "active": "0b0a1f5e1c951518", "lastOpenFiles": [ - "1000s Templates/Literature Note.md", "200. Library Papers/liSyntheticLagrangianTurbulence2024.md", + "conflict-files-obsidian-git.md", + "4. Qualifying Exam/99. Exports/QE Abstract For Dan.pdf", + "4. Qualifying Exam/99. Exports", + "4. Qualifying Exam/1. Managing Stuff/QE Research Questions.md", + "4. Qualifying Exam/0. Overview/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf", + "4. Qualifying Exam/0. Overview/0. QE Overview.md", + "4. Qualifying Exam/0. Overview", + "2024-09-09.md", + "2024-09-06.md", + "1. Daily Notes/2024/9. September/2024-09-05.md", + "1000s Templates/Literature Note.md", "3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md", "1. Daily Notes/2024/9. September/2024-09-04.md", "200. Library Papers/kleinFormallyVerifiedSoftware2018.md", @@ -216,22 +238,12 @@ "3-99 Research/99. Getting Used to Obsidian/Dataview Tutorial.md", "3-99 Research/99. Getting Used to Obsidian/Markdown Cheat Sheet.md", "3-99 Research/99. Getting Used to Obsidian/Learn Obsidian Best Practices.md", - "3-99 Research/99. Getting Used to Obsidian/Move Ideas over from Notion.md", - "3-99 Research/99. Getting Used to Obsidian/Notion to Obsidian Transition.md", - "3-99 Research/99. Getting Used to Obsidian/Useful Obsidian Docs Links.md", - "200. Library Papers/maccaroneADVANCEDREACTORCYBER.md", - "@maccaroneADVANCEDREACTORCYBER.md", - "200. Library Papers/chekoleEnforcingMemorySafety2018.md", "4. Qualifying Exam/2. Writing/Untitled.bib", "4. Qualifying Exam/2. Writing/test.bib", "201. Metadata/My Library/files/4011/contextual.css", "201. Metadata/My Library/files/4011/tabledrag_002.css", "201. Metadata/My Library/files/4011/ui-dialog.css", - "201. Metadata/My Library/files/4011/item-list.css", "201. Metadata/My Library/files/4011/header-degreefinder-cybersecurity.jpg", - "201. Metadata/My Library/files/4011/style.css", - "201. Metadata/My Library/files/4011/all.css", - "201. Metadata/My Library/files/4011/icons.css", "201. Metadata/My Library/files/4011/cathedral-summersmall.jpg", "201. Metadata/My Library/files/4011/johanna-montoya-PRumW--tkc4-unsplash-wind250.jpg", "201. Metadata/My Library/files/4011/powerensm.jpg", diff --git a/1. Daily Notes/2024/9. September/2024-09-03.md b/1. Daily Notes/2024/9. September/2024-09-03.md index cfbd7e788..81d7e0536 100644 --- a/1. Daily Notes/2024/9. September/2024-09-03.md +++ b/1. Daily Notes/2024/9. September/2024-09-03.md @@ -15,7 +15,7 @@ tags: ## Medium Tasks - [ ] [[Cole Group Monitor Reccomendations]] - [ ] Create [[ReadMe for BeagleBone GitHub]] -- [ ] [[QE Management]] +- [ ] [[QE Research Questions]] ## Small Tasks - [ ] Organize library in Zotero - [ ] BeagleBone? diff --git a/1. Daily Notes/2024/9. September/2024-09-04.md b/1. Daily Notes/2024/9. September/2024-09-04.md index 4ba7ac6f6..dba367dc5 100644 --- a/1. Daily Notes/2024/9. September/2024-09-04.md +++ b/1. Daily Notes/2024/9. September/2024-09-04.md @@ -11,7 +11,7 @@ tags: # Tasks for today ## Big Task - - [/] [[QE Management]] + - [/] [[QE Research Questions]] ## Medium Tasks - [ ] [[Cole Group Monitor Recommendation]] - [ ] [[ReadMe for BeagleBone GitHub]] diff --git a/1. Daily Notes/2024/9. September/2024-09-05.md b/1. Daily Notes/2024/9. September/2024-09-05.md new file mode 100644 index 000000000..83b7ed20a --- /dev/null +++ b/1. Daily Notes/2024/9. September/2024-09-05.md @@ -0,0 +1,29 @@ +--- +creation_date: 2024-09-05 +modification_date: Thursday 5th September 2024 09:21:54 +tags: + - DailyNote +--- +# Yesterday | Tomorrow + << [[2024-09-04]] | [[2024-09-06]] >> +# This Week's Weekly Note +[[Weekly Note 2024-08-07]] + +# Tasks for today +## Big Task + - [ ] +## Medium Tasks +- [ ] +- [ ] +- [ ] +## Small Tasks +- [ ] +- [ ] +- [ ] +- [ ] +- [ ] + +# Calendar Tasks +- QE Exam Management Pages [startTime:: 09:30] [endTime:: 10:00] +- Lunch [startTime:: 12:30] [endTime:: 13:30] +- Seminar [startTime:: 10:00] [endTime:: 12:30] \ No newline at end of file diff --git a/1000s Templates/Daily Note Template.md b/1000s Templates/Daily Note Template.md index aad923f95..024799edd 100755 --- a/1000s Templates/Daily Note Template.md +++ b/1000s Templates/Daily Note Template.md @@ -1,13 +1,11 @@ --- -creation_date: <% tp.date.now() %> modification_date: <% tp.file.last_modified_date("dddd Do MMMM YYYY HH:mm:ss") %> -tags: - - DailyNote +tags: [] --- # Yesterday | Tomorrow - << [[<% tp.date.now("YYYY-MM-DD", -1) %>]] | [[<% tp.date.now("YYYY-MM-DD", +1) %>]] >> + << [[<%*if (tp.date.weekday("YYYY-MM-DD", 1, tp.file.title, "YYYY-MM-DD") == tp.file.title) { tR += tp.date.now("YYYY-MM-DD", -3, tp.file.title, "YYYY-MM-DD"); } else { tR += tp.date.now("YYYY-MM-DD", -1, tp.file.title, "YYYY-MM-DD");} %>]] | [[<%*if (tp.date.weekday("YYYY-MM-DD", 5, tp.file.title, "YYYY-MM-DD") == tp.file.title) { tR += tp.date.now("YYYY-MM-DD", +3, tp.file.title, "YYYY-MM-DD"); } else { tR += tp.date.now("YYYY-MM-DD", +1, tp.file.title, "YYYY-MM-DD");} %> ]] >> # This Week's Weekly Note -[[Weekly Note 2024-08-07]] +[[<%*if (tp.date.weekday("YYYY-MM-DD", 3, tp.file.title, "YYYY-MM-DD") >= tp.file.title) {tR += tp.date.weekday("YYYY-MM-DD", -4, tp.file.title, "YYYY-MM-DD"); } else {tR += tp.date.weekday("YYYY-MM-DD", 3, tp.file.title, "YYYY-MM-DD"); } %>]] # Tasks for today ## Big Task diff --git a/2024-09-06.md b/2024-09-06.md new file mode 100644 index 000000000..709b0a18a --- /dev/null +++ b/2024-09-06.md @@ -0,0 +1,24 @@ +--- +modification_date: Thursday 5th September 2024 10:02:36 +tags: [] +--- +# Yesterday | Tomorrow + << [[2024-09-05]] | [[2024-09-09 ]] >> +# This Week's Weekly Note +[[2024-09-04]] + +# Tasks for today +## Big Task + - [ ] +## Medium Tasks +- [ ] +- [ ] +- [ ] +## Small Tasks +- [ ] +- [ ] +- [ ] +- [ ] +- [ ] + +# Calendar Tasks \ No newline at end of file diff --git a/2024-09-09.md b/2024-09-09.md new file mode 100644 index 000000000..1ca34b6b1 --- /dev/null +++ b/2024-09-09.md @@ -0,0 +1,24 @@ +--- +modification_date: Thursday 5th September 2024 10:06:32 +tags: [] +--- +# Yesterday | Tomorrow + << [[2024-09-06]] | [[2024-09-10 ]] >> +# This Week's Weekly Note +[[2024-09-04]] + +# Tasks for today +## Big Task + - [ ] +## Medium Tasks +- [ ] +- [ ] +- [ ] +## Small Tasks +- [ ] +- [ ] +- [ ] +- [ ] +- [ ] + +# Calendar Tasks \ No newline at end of file diff --git a/4. Qualifying Exam/1. Managing Stuff/QE Tasks and Details.md b/4. Qualifying Exam/0. Overview/0. QE Overview.md similarity index 100% rename from 4. Qualifying Exam/1. Managing Stuff/QE Tasks and Details.md rename to 4. Qualifying Exam/0. Overview/0. QE Overview.md diff --git a/4. Qualifying Exam/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf b/4. Qualifying Exam/0. Overview/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf similarity index 100% rename from 4. Qualifying Exam/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf rename to 4. Qualifying Exam/0. Overview/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf diff --git a/4. Qualifying Exam/1. Managing Stuff/QE Management.md b/4. Qualifying Exam/1. Managing Stuff/QE Management.md deleted file mode 100644 index e69de29bb..000000000 diff --git "a/\"[Full.md" b/4. Qualifying Exam/1. Managing Stuff/QE Research Questions.md similarity index 100% rename from "\"[Full.md" rename to 4. Qualifying Exam/1. Managing Stuff/QE Research Questions.md diff --git a/4. Qualifying Exam/QE Abstract For Dan.pdf b/4. Qualifying Exam/99. Exports/QE Abstract For Dan.pdf similarity index 100% rename from 4. Qualifying Exam/QE Abstract For Dan.pdf rename to 4. Qualifying Exam/99. Exports/QE Abstract For Dan.pdf diff --git a/4. Qualifying Exam/Qualifying Exam.md b/4. Qualifying Exam/Qualifying Exam.md deleted file mode 100644 index fb9aaacfc..000000000 --- a/4. Qualifying Exam/Qualifying Exam.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -creation date: 2024-08-28 -modification date: Wednesday 28th August 2024 08:32:34 -tags: ---- -# Preamble -## Notable Links -[[Qualifying Exam Papers]] -[[Diffusion Generative Models for Automated Perturbation Generation]] -[[ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf]] - - diff --git a/900s Calendars/3. Events/2024-09-08 Steelers Game.md b/900s Calendars/3. Events/2024-09-08 Steelers Game.md deleted file mode 100644 index f934bb4f9..000000000 --- a/900s Calendars/3. Events/2024-09-08 Steelers Game.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Steelers Game -allDay: true -date: 2024-09-08 -completed: null ---- diff --git a/[Full.md b/[Full.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/{uri}.md b/{uri}.md deleted file mode 100644 index e69de29bb..000000000