vault backup: 2024-08-12 11:41:37

.obsidian/community-plugins.json

@@ -1,4 +1,5 @@
 [
   "obsidian-git",
-  "obsidian-importer"
+  "obsidian-importer",
+  "numerals"
 ]

.obsidian/graph.json

@@ -17,6 +17,10 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
+<<<<<<< HEAD
+  "scale": 0.3628873693012147,
+=======
   "scale": 0.36288736930121507,
+>>>>>>> origin/main
   "close": false
 }

.obsidian/plugins/numerals/manifest.json

@@ -0,0 +1,10 @@
+{
+	"id": "numerals",
+	"name": "Numerals",
+	"version": "1.5.0",
+	"minAppVersion": "0.16.0",
+	"description": "Numerals turns any code block into an advanced calculator. Evaluates math expressions on each line of a code block, including units, currency, and optional TeX rendering.",
+	"author": "RyanC",
+	"authorUrl": "https://github.com/gtg922r/obsidian-numerals",
+	"isDesktopOnly": false
+}

.obsidian/plugins/numerals/styles.css

@@ -0,0 +1,301 @@
+/* @settings
+
+name: Numerals
+id: numerals-style
+settings:
+    - 
+        id: numerals-comment
+        title: In-line Comment Color
+        description: Color of the text in in-line comments. Default is `--code-comment`.
+        type: variable-themed-color
+        format: hex
+        opacity: false
+        default-light: '#'
+        default-dark: '#'
+    - 
+        id: numerals-heading
+        title: Heading / Comment Line Color
+        description: Color of lines with only a comment. Default is `--code-comment`.
+        type: variable-themed-color
+        format: hex
+        opacity: false
+        default-light: '#'
+        default-dark: '#'
+    - 
+        id: numerals-background
+        title: Block background color
+        description: Background color of the block. Default is same as code-block background. 
+        type: variable-themed-color
+        format: hex
+        opacity: false
+        default-light: '#'
+        default-dark: '#'         
+    - 
+        id: numerals-alternating-row-color
+        title: Alternating Row Color
+        description: Background color for the row when alternating rows (when enabled)
+        type: variable-themed-color
+        format: hex
+        opacity: false
+        default-light: '#'
+        default-dark: '#'            
+    - 
+        id: numerals-font
+        title: Numerals block font
+        description: Font used for Numerals block. Default is same as a code-block
+        type: variable-text
+        default: ''
+    - 
+        id: numerals-size
+        title: Numerals block font size
+        description: Accepts an CSS font-size value. Default is same as a code-block
+        type: variable-text
+        default: ''
+    - 
+        id: numerals-emitter-input-weight
+        title: Annotated Result Input Font Weight
+        description: Font weight for input which has result annotation (`=>`) (accepts CSS font-weight value). Default is `var(--normal-weight)`.
+        type: variable-text
+        default: ''        
+*/
+
+/***********************************/
+/******** Non-setting specific   **/
+
+body {
+    --numerals-comment: var(--code-comment);
+    --numerals-heading: var(--code-comment);
+    --numerals-background: var(--code-background);
+    --numerals-font: var(--font-monospace);
+    --numerals-size: var(--code-size);
+    --numerals-emitter-input-weight: var(--normal-weight);
+    --numerals-alternating-row-color: var(--background-modifier-hover);
+}
+
+.numerals-syntax .numerals-input span {
+    padding: 0 2px;
+}
+.numerals-syntax .numerals-input {
+    overflow-wrap: break-word;
+}
+.numerals-block .numerals-input .math-parenthesis,
+ .numerals-block .numerals-input .math-paranthesis {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+
+.numerals-block .numerals-input .math-number {
+    color: var(--code-value);
+}
+.numerals-block .numerals-input .math-string {
+    color: var(--code-string);
+}
+.numerals-block .numerals-input .math-boolean {
+    color: var(--code-value);
+}
+.numerals-block .numerals-input .math-undefined {
+    color: var(--code-keyword);
+    display: none;
+}
+.numerals-block .numerals-input .math-function {
+    color: var(--code-function);
+}
+.numerals-block .numerals-input .math-parameter {
+    color: var(--code-property);
+}
+.numerals-block .numerals-input .math-property {
+    color: var(--code-property);
+}
+.numerals-block .numerals-input .math-symbol {
+    color: var(--code-property);
+}
+.numerals-block .numerals-input .math-operator {
+    color: var(--code-operator);
+}
+.numerals-block .numerals-input .math-parenthesis,
+ .numerals-block .numerals-input .math-paranthesis {
+    color: var(--code-punctuation);
+    padding-left: 0px;
+    padding-right: 0px;
+}
+.numerals-block .numerals-input .math-separator {
+    color: var(--code-punctuation);
+}
+
+.numerals-block  {
+    color: var(--code-normal);
+    background-color: var(--numerals-background);
+    font-family: var(--numerals-font);    
+    font-size: var(--numerals-size);    
+    padding: var(--size-4-4);    
+} 
+
+.numerals-block .MathJax {
+    text-align: left !important;
+    margin-top: .5em !important;
+    margin-bottom: .5em !important;
+} 
+
+.numerals-input.numerals-empty {
+    font-weight: bold;
+    color: var(--numerals-heading);
+}
+
+.numerals-input .numerals-tex {
+    display:inline-block;
+}
+
+.numerals-input .numerals-inline-comment {
+    display: inline-block;
+    padding-left: 1em;
+    color: var(--numerals-comment);
+}
+.numerals-input .numerals-sum {
+    font-style: italic;
+}
+
+.numerals-alt-row-color .numerals-line:nth-child(even){
+    background-color: var(--numerals-alternating-row-color);
+}
+
+.numerals-alt-row-color .numerals-line .numerals-input{
+    padding-left: var(--size-2-2);
+}
+
+.numerals-alt-row-color .numerals-line .numerals-result {
+    padding-right: var(--size-2-2);        
+}
+
+.numerals-error-name {
+    color:var(--color-red);
+    padding-right: var(--size-4-2);
+}
+
+/**********************************/
+/* ** Right-aligned Style ** */
+
+/* TODO Switch to a diffent display layout so that result can be centered */
+
+.numerals-answer-right .numerals-line {
+    line-height: var(--line-height-tight);
+    clear: both;
+    overflow: auto;    
+}
+
+.numerals-answer-right .numerals-input {
+    float: left;
+}
+
+.numerals-answer-right .numerals-result {
+    float: right;
+    color: var(--code-punctuation);
+}
+
+/**********************************/
+/* ** Two Panes Style ** */
+/* this leads to filling all the way to the bottom of the container. probably bigger than desired */
+.numerals-panes .numerals-line {
+    line-height: var(--line-height-tight);
+ 
+}
+
+.numerals-panes .numerals-line {
+    display: flex;
+ }
+ 
+.numerals-panes .numerals-input {
+    width:75%;
+}
+
+.numerals-panes .numerals-result {
+    color: var(--code-punctuation);
+    background-color: var(--background-modifier-hover);
+    width: 25%;
+    text-align: left;
+    padding-left: var(--size-2-2);
+    border-left: 1px solid var(--background-modifier-border-focus);
+}
+
+/* .numerals-panes .MathJax {
+    float:left;
+} */
+
+
+/**********************************/
+/* ** Result on following line ** */
+
+.numerals-answer-below .numerals-line {
+    line-height: var(--line-height-tight);
+}
+
+.numerals-answer-below .numerals-line .numerals-result,
+.numerals-answer-below .numerals-line .numerals-input  {
+    display:block;
+}
+
+.numerals-answer-below .numerals-line .numerals-result {
+    color: var(--code-punctuation);
+    padding-left: var(--size-4-4);
+    padding-bottom: var(--size-2-1);
+}
+
+.numerals-answer-below .numerals-line .numerals-input {
+    padding-top: var(--size-2-1);
+}
+
+.numerals-answer-below .numerals-input.numerals-empty {
+    padding-top: var(--size-4-3);
+    padding-bottom: var(--size-4-1);
+}
+
+.numerals-answer-below .numerals-result.numerals-empty {
+    display: none;
+}
+
+/* Don't show text in .numerals-result that and aren't descendents of .numerals-emitter */
+.numerals-emitters-present:not(.numerals-hide-non-emitters) .numerals-result:not(.numerals-emitter .numerals-result) {
+    color: var(--code-comment);
+}
+
+.numerals-emitter .numerals-input {
+    font-weight: var(--numerals-emitter-input-weight)
+}
+
+.numerals-emitters-present.numerals-hide-non-emitters .numerals-result:not(.numerals-emitter .numerals-result) {
+    color: transparent;
+}
+
+
+/**********************************/
+/* ** Inline Style ** */
+/* TODO Switch to a diffent display layout so that result can be centered */
+
+.numerals-answer-right .numerals-line {
+    line-height: var(--line-height-tight);
+    /* clear: both; */
+    /* overflow: auto;     */
+}
+
+.numerals-answer-inline .numerals-input {
+    display:inline-block;
+    padding-right: 20px;
+    /* float: left; */
+}
+
+.numerals-answer-inline .numerals-result {
+    /* float: right; */
+    color: var(--code-punctuation);
+    display:inline-block;
+}
+
+
+/***************************/
+/* ** Suggestion Style ** */
+
+/* .numerals-suggestion-icon {
+  --icon-size: 1em;
+} */
+.numerals-suggestion {
+    font-family: var(--numerals-font);
+    font-size: var(--numerals-size);
+}

.obsidian/workspace.json

@@ -31,6 +31,18 @@
               }
             }
           },
+          {
+            "id": "1e19237c32bd5394",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
           {
             "id": "97a3cb4c603d8875",
             "type": "leaf",
@@ -44,7 +56,7 @@
             }
           }
         ],
-        "currentTab": 1
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -110,7 +122,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Lenovo laptop model differences.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -127,7 +139,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Lenovo laptop model differences.md",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": false
               }
@@ -150,7 +162,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Lenovo laptop model differences.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           }
@@ -172,55 +184,55 @@
       "obsidian-importer:Open Importer": false
     }
   },
-  "active": "9a14cb3c3def324a",
+  "active": "1e19237c32bd5394",
   "lastOpenFiles": [
-    "Work/Daily Log/2024-08-12 (Monday).md",
     "Lenovo laptop model differences.md",
-    "Work/Daily Log/2024-08-09 (Friday).md",
-    "Work/Daily Log/2024-08-10 (Saturday).md",
-    "Work/BigCommerce Notes.md",
-    "Work/2024-08-02 Order-level discounting email response to Dan.md",
+    "conflict-files-obsidian-git.md",
+    "Shopping/Shopping list.md",
+    "Shopping/Shopping list 2.md",
+    "Shopping/Shopping List 1.md",
+    "Shopping/Sam’s.md",
+    "Shopping/Sam’s club.md",
+    "Shopping/Sam’s club 3.md",
+    "Shopping/Sam’s club 2.md",
+    "Shopping/Sam’s Club 1.md",
+    "Shopping/Lowe’s.md",
+    "Shopping/Lowes shopping list.md",
+    "Shopping/Lowes.md",
+    "Shopping/Lowes 3.md",
+    "Shopping/Lowes 1.md",
+    "Shopping/Lowes 2.md",
+    "Shopping/Jozwick Sam’s list.md",
+    "Shopping/Groceries.md",
+    "Shopping/Aldi.md",
+    "Shopping/Grace's birthday shopping list.md",
+    "Shopping",
+    "Bible Study/Psalms/Psalm 2 Outline.md",
+    "Bible Study/Psalms/Psalm 3 Outline.md",
+    "Bible Study/Psalms/Psalm 130.md",
+    "Bible Study/Psalms/Psalm 1 Outline.md",
+    "Bible Study/Psalms",
+    "Bible Study/Messages/Messages ideas for 9292019.md",
+    "Bible Study/Messages/2020.04.05 Psalm 130.md",
+    "Bible Study/Messages",
+    "Work/Training/Advanced Distributed Systems",
+    "Work/Training",
+    "Work/Freelance/OAP",
+    "Work/Freelance/Brandhoot",
+    "Work/Freelance",
+    "Home/Projects",
+    "Home/Maintenance",
     "Work/2024-08-05 Duplicate billing profile bug hunting (BEN-1564).canvas",
-    "Messages/2018.02.04 Galatians 57-12.md",
-    "Messages/2017.10.01 Luke 1213-21.md",
-    "Prayer Meetings/Nathan and Ashley Hanson home, 8272019.md",
-    "Prayer Meetings/Chapel, 9272020.md",
-    "Prayer Meetings/Chapel, 9112019.md",
-    "Prayer Meetings/Chapel, 1242019.md",
-    "Prayer Meetings/Chapel, 342020.md",
-    "Quick Notes/2002 Coachman Clipper 106 Sport Pop-Up Camper, Dometic Refrigerator, Suburban Furnace, Vitco 2-Burner Range, No Propane Tank, VIN 1TC1C510X35002745 - Mayo Auction & Realty.md",
-    "Work/Daily Log/2024-08-06 (Tuesday).md",
-    "Work/Daily Log/2024-08-08 (Thursday).md",
-    "Work/Daily Log/2024-08-07 (Wednesday).md",
-    "Work/Daily Log/2024-08-05 (Monday).md",
-    "Work/Daily Log/2024-08-02 (Friday).md",
-    "Work/Daily Log/2024-08-01 (Thursday).md",
-    "Work/Daily Log",
-    "Reading/Read Later/Paper Moving off the Map.md",
-    "Reading/Read Later/httpsworld.hey.comdhhcloud-exit-pays-off-in-performance-too-4c53b697.md",
-    "Reading/Read Later/httpsblackgirlbytes.deva-beginners-guide-to-prompt-engineering-with-github-copilot.md",
-    "Reading/Read Later/Real World Recommendation System – Part 1.md",
-    "Reading/Read Later/2020-01-31 Tech Talk - Michael Sterling - Royalties - Faithlife Coders - Amber.md",
-    "[3.md",
     "_Attachments/Exported image 20240808113933-0.gif",
     "_Attachments/Exported image 20240808113924-0.png",
     "_Attachments/Exported image 20240808113917-0 1.jpeg",
     "_Attachments/Exported image 20240808114111-0.jpeg",
     "_Attachments/Exported image 20240808113938-0.png",
-    "_Attachments/305e82da0687bc4fb7ab116f2a3407cf.pdf",
-    "_Attachments/p4028.pdf",
     "_Attachments/Exported image 20240808113939-0.jpeg",
     "_Attachments/Exported image 20240808113917-0.jpeg",
     "_Attachments/Exported image 20240808113914-0.png",
     "_Attachments/Exported image 20240808113940-0.jpeg",
     "_Attachments/Exported image 20240808113911-0.png",
-    "httpsblackgirlbytes.deva-beginners-guide-to-prompt-engineering-with-github-copilot.md/Attachment.pdf",
-    "httpsworld.hey.comdhhcloud-exit-pays-off-in-performance-too-4c53b697.md/Attachment.pdf",
-    "_Attachments",
-    "Logos meeting notes",
-    "Reading Movies",
-    "Quick Notes",
-    "Prayer Meetings",
     "Untitled.canvas"
   ]
 }

Chapel/FBH singing 1013.md

@@ -1,3 +0,0 @@
-- [ ] 251 - there is power in the blood  
-9 - I sing the might power  
-34 - all hail the power

Chapel/FBH singing, 1282019.md

@@ -1,3 +0,0 @@
-142 o come all ye faithful  
-152 while shepherds watched their flocks  
-155 it came upon a midnight clear

Chapel/Kids singing 1013.md

@@ -1,3 +0,0 @@
-36  
-46  
-7

Chapel/Shepherding a Child's Heart book club.md

@@ -1 +0,0 @@
-# Introduction

Church/Chapel prayer items.md

@@ -0,0 +1,2 @@
+- How to approach helping young men "launch"
+- Unity around the vision of the chapel, what elements should be part of the "vision"