xmas update

3 years ago · 7675f73961
parent bae6240439
commit 7675f73961
18 changed files with 130313 additions and 92225 deletions
--- a/.obsidian/plugins/fantasy-calendar/data.json
+++ b/.obsidian/plugins/fantasy-calendar/data.json
@ -183,7 +183,7 @@
      "current": {
        "year": 2021,
        "month": 11,
-        "day": 23
+        "day": 29
      },
      "events": [
        {
@ -672,14 +672,14 @@
          "name": "IT & Computer",
          "note": "01.01 Life Orga/IT & Computer.md",
          "date": {
-            "year": 2021,
-            "month": 11,
+            "year": 2022,
+            "month": 5,
            "day": 15
          },
          "category": "ID_3b8a489a19da",
          "end": {
-            "year": 2021,
-            "month": 11,
+            "year": 2022,
+            "month": 5,
            "day": 15
          }
        },
@ -1033,12 +1033,20 @@
          "name": "Task"
        }
      ],
-      "date": 1639896126205
+      "date": 1640360816890
    }
  ],
  "currentCalendar": null,
  "defaultCalendar": "ID_cb9b8ac84809",
  "eventPreview": true,
  "configDirectory": null,
-  "path": "/"
+  "path": "/",
+  "parseDates": false,
+  "dateFormat": "YYYY-MM-DD",
+  "dailyNotes": false,
+  "version": {
+    "major": null,
+    "minor": null,
+    "patch": null
+  }
 }
--- a/.obsidian/plugins/fantasy-calendar/main.js
+++ b/.obsidian/plugins/fantasy-calendar/main.js
--- a/.obsidian/plugins/fantasy-calendar/manifest.json
+++ b/.obsidian/plugins/fantasy-calendar/manifest.json
@ -1,7 +1,7 @@
 {
 	"id": "fantasy-calendar",
 	"name": "Fantasy Calendar",
-	"version": "1.10.1",
+	"version": "1.11.0",
 	"minAppVersion": "0.12.10",
 	"author": "Jeremy Valentine",
 	"description": "Fantasy calendars in Obsidian!",
--- a/.obsidian/plugins/obsidian-dice-roller/main.js
+++ b/.obsidian/plugins/obsidian-dice-roller/main.js
@ -33700,7 +33700,7 @@ var D4DiceShape = class extends DiceShape {
 };

 // src/view/renderer.ts
-var DiceRenderer = class extends import_obsidian7.Component {
+var _DiceRenderer = class extends import_obsidian7.Component {
  constructor(plugin) {
    super();
    this.plugin = plugin;
@ -33729,6 +33729,7 @@ var DiceRenderer = class extends import_obsidian7.Component {
      medium: null,
      far: null
    };
+    this.extraFrames = _DiceRenderer.DEFAULT_EXTRA_FRAMES;
    this.renderer = new WebGLRenderer({
      alpha: true,
      antialias: true
@ -33792,6 +33793,7 @@ var DiceRenderer = class extends import_obsidian7.Component {
          reject2(e);
        });
        this.animating = true;
+        this.extraFrames = _DiceRenderer.DEFAULT_EXTRA_FRAMES;
        this.render();
      }));
    });
@ -33850,7 +33852,7 @@ var DiceRenderer = class extends import_obsidian7.Component {
      this.scene.remove(this.light);
    if (this.ambientLight)
      this.scene.remove(this.ambientLight);
-    this.light = new SpotLight(this.colors.spotlight, 1);
+    this.light = new SpotLight(this.colors.spotlight, 0.25);
    this.light.position.set(-maxwidth / 2, maxwidth / 2, maxwidth * 3);
    this.light.target.position.set(0, 0, 0);
    this.light.distance = maxwidth * 5;
@ -33924,6 +33926,9 @@ var DiceRenderer = class extends import_obsidian7.Component {
  }
  render() {
    if (this.throwFinished()) {
+      if (this.extraFrames > 10) {
+        this.extraFrames--;
+      } else {
        try {
          this.returnResult();
          this.registerInterval(window.setTimeout(() => {
@ -33938,6 +33943,7 @@ var DiceRenderer = class extends import_obsidian7.Component {
        }
        return;
      }
+    }
    this.animation = requestAnimationFrame(() => this.render());
    this.world.step(this.frame_rate);
    this.iterations++;
@ -33982,7 +33988,7 @@ var DiceRenderer = class extends import_obsidian7.Component {
  }
  throwFinished() {
    let res = true;
-    const threshold = 6;
+    const threshold = 4;
    if (this.iterations < 10 / this.frame_rate) {
      for (const diceArray of this.current.values()) {
        for (const dice of diceArray) {
@ -34009,6 +34015,8 @@ var DiceRenderer = class extends import_obsidian7.Component {
    return res;
  }
 };
+var DiceRenderer = _DiceRenderer;
+DiceRenderer.DEFAULT_EXTRA_FRAMES = 30;
 var World2 = class {
  constructor(WIDTH, HEIGHT) {
    this.WIDTH = WIDTH;
@ -34042,12 +34050,21 @@ var World2 = class {
  buildWalls() {
    this.world.addContactMaterial(new ContactMaterial(this.deskMaterial, this.diceMaterial, {
      friction: 0.01,
-      restitution: 0.5
+      restitution: 0.5,
+      contactEquationRelaxation: 3,
+      contactEquationStiffness: 1e8
+    }));
+    this.world.addContactMaterial(new ContactMaterial(this.barrierMaterial, this.diceMaterial, {
+      friction: 0.01,
+      restitution: 1,
+      contactEquationRelaxation: 3,
+      contactEquationStiffness: 1e8
    }));
-    this.world.addContactMaterial(new ContactMaterial(this.barrierMaterial, this.diceMaterial, { friction: 0, restitution: 1 }));
    this.world.addContactMaterial(new ContactMaterial(this.diceMaterial, this.diceMaterial, {
-      friction: 0,
-      restitution: 0.5
+      friction: 0.1,
+      restitution: 0.5,
+      contactEquationRelaxation: 3,
+      contactEquationStiffness: 1e8
    }));
    this.world.addBody(new Body({
      allowSleep: false,
@ -34103,16 +34120,16 @@ var DEFAULT_VECTOR = {
  pos: {
    x: 0 + 100 * Math.random(),
    y: 0 + 100 * Math.random(),
-    z: 0 + 100
+    z: 0 + 250
  },
  velocity: {
-    x: 500 * Math.random() * 2 - 1,
-    y: 500 * Math.random() * 2 - 1,
+    x: 600 * (Math.random() * 2 + 1),
+    y: 750 * (Math.random() * 2 + 1),
    z: 0
  },
  angular: {
-    x: 100 * Math.random(),
-    y: 100 * Math.random(),
+    x: 200 * Math.random(),
+    y: 200 * Math.random(),
    z: 100 * Math.random()
  },
  axis: {
--- a/.obsidian/plugins/obsidian-dice-roller/manifest.json
+++ b/.obsidian/plugins/obsidian-dice-roller/manifest.json
@ -1,7 +1,7 @@
 {
    "id": "obsidian-dice-roller",
    "name": "Dice Roller",
-    "version": "7.10.1",
+    "version": "7.10.2",
    "minAppVersion": "0.12.15",
    "description": "Inline dice rolling for Obsidian.md",
    "author": "Jeremy Valentine",
--- a/.obsidian/plugins/obsidian-dynamic-toc/main.js
+++ b/.obsidian/plugins/obsidian-dynamic-toc/main.js
--- a/.obsidian/plugins/obsidian-dynamic-toc/manifest.json
+++ b/.obsidian/plugins/obsidian-dynamic-toc/manifest.json
@ -4,6 +4,6 @@
  "author": "aidurber",
  "description": "An Obsidian plugin to generate Tables of Contents that stay up to date with your document outline.",
  "minAppVersion": "0.11.0",
-  "version": "0.0.18",
+  "version": "0.0.20",
  "repo": "aidurber/obsidian-plugin-dynamic-toc"
 }
--- a/.obsidian/plugins/rss-reader/data.json
+++ b/.obsidian/plugins/rss-reader/data.json
--- a/.obsidian/plugins/rss-reader/main.js
+++ b/.obsidian/plugins/rss-reader/main.js
--- a/.obsidian/plugins/rss-reader/manifest.json
+++ b/.obsidian/plugins/rss-reader/manifest.json
@ -1,8 +1,8 @@
 {
 	"id": "rss-reader",
 	"name": "RSS Reader",
-	"version": "0.9.1",
-	"minAppVersion": "0.9.12",
+	"version": "0.9.2",
+	"minAppVersion": "0.13.14",
 	"description": "Read RSS Feeds from within obsidian",
 	"author": "Johannes Theiner",
 	"authorUrl": "https://github.com/joethei",
--- a/.obsidian/plugins/rss-reader/styles.css
+++ b/.obsidian/plugins/rss-reader/styles.css
@ -36,7 +36,7 @@ input.is-invalid {
    color: #dc3545;
 }

-.scrollable-content {
+.rss-scrollable-content {
    overflow: auto;
    height: 60vh;
 }
@ -74,3 +74,7 @@ input.is-invalid {
 .is-mobile button.rss-button {
    width: auto;
 }
+
+.rss-selectable {
+    user-select: text;
+}
--- a/.obsidian/workspace
+++ b/.obsidian/workspace
@ -9,7 +9,7 @@
        "state": {
          "type": "markdown",
          "state": {
-            "file": "03.03 Food & Wine/@Main dishes.md",
+            "file": "05.02 Networks/Selfhosting.md",
            "mode": "preview"
          }
        }
@ -76,7 +76,7 @@
        "state": {
          "type": "backlink",
          "state": {
-            "file": "03.03 Food & Wine/@Main dishes.md",
+            "file": "05.02 Networks/Selfhosting.md",
            "collapseAll": false,
            "extraContext": false,
            "sortOrder": "alphabetical",
@ -96,15 +96,15 @@
        }
      },
      {
-        "id": "15bcb037002a76a7",
+        "id": "03ec05e66b85ebba",
        "type": "leaf",
        "state": {
-          "type": "FANTASY_CALENDAR",
+          "type": "reminder-list",
          "state": {}
        }
      },
      {
-        "id": "fc559232cdc23159",
+        "id": "46bb0a2a0fdefdba",
        "type": "leaf",
        "state": {
          "type": "DICE_ROLLER_VIEW",
@ -112,35 +112,35 @@
        }
      },
      {
-        "id": "94e7f78d3bc93ce7",
+        "id": "45fc71e3d6839ed8",
        "type": "leaf",
        "state": {
-          "type": "RSS_FEED",
+          "type": "FANTASY_CALENDAR",
          "state": {}
        }
      },
      {
-        "id": "03ec05e66b85ebba",
+        "id": "eb3a8f6b12662774",
        "type": "leaf",
        "state": {
-          "type": "reminder-list",
+          "type": "RSS_FEED",
          "state": {}
        }
      }
    ],
-    "currentTab": 4
+    "currentTab": 5
  },
  "active": "f02b54d5135a4e7e",
  "lastOpenFiles": [
+    "05.02 Networks/Selfhosting.md",
+    "05.02 Networks/Domains.md",
+    "01.01 Life Orga/Finances.md",
+    "01.02 Home/MRCK.md",
+    "01.01 Life Orga/IT & Computer.md",
    "03.03 Food & Wine/@Main dishes.md",
    "03.03 Food & Wine/Pasta e Ceci.md",
    "03.03 Food & Wine/@@Recipes.md",
-    "01.02 Home/MRCK.md",
    "06.02 Investments/@Investment Task master.md",
-    "01.01 Life Orga/Finances.md",
-    "01.01 Life Orga/@Life Organisation.md",
-    "02.02 Paris/Brach Hotel.md",
-    "02.02 Paris/@@Paris.md",
-    "00.01 Admin/Templates/NewFile1.md"
+    "01.01 Life Orga/@Life Organisation.md"
  ]
 }
--- a/Computer.md
+++ b/Computer.md
@ -7,8 +7,8 @@ Hierarchy: "NonRoot"
 Priority: "Medium"
 Status: Completed
 StartDate: 2021-08-12
-DueDate: 2021-12-31
-NextReviewDate: &RD 2021-12-15
+DueDate: 2022-12-31
+NextReviewDate: &RD 2022-06-15
 TimeStamp: 2021-08-12
 location: [51.514678599999996, -0.18378583926867909]
 fc-calendar: "D2D Calendar"
--- a/Home/MRCK.md
+++ b/Home/MRCK.md
@ -148,6 +148,8 @@ Paris, Zürich, London
 Florists: Fjura, Still Life
 ***Le labo***: Another 13

+***Mamma-mo***: Candle Jo Malone Lime, Basil, Mandarine
+
 &emsp;

 ---
@ -165,8 +167,8 @@ Florists: Fjura, Still Life
 - [ ] :gift: :books: Livre
 	- [ ] :gift: :books: mon bel oranger
 	- [ ] :gift: :books: tistou les pouces verts
-	- [ ] :gift: :books: Fran Lebowitz
-	- [ ]  :gift: :books: Amy Winehouse, beyond black
+	- [x] :gift: :books: Fran Lebowitz ✅ 2021-12-23
+	- [x] :gift: :books: Amy Winehouse, beyond black ✅ 2021-12-23
 - [ ] :gift: [Journal protection](https://www.wayfair.co.uk/home-decor/pdp/house-of-hampton-tamara-book-box-u000526750.html)
 - [ ] :gift: [Bijou Ours](https://www.tous.com/): [Gold Sweet Dolls Bracelet | TOUS](https://www.tous.com/gb-en/gold-sweet-dolls-bracelet/p/815911150)
 - [x] :gift: livre paris ✅ 2020-12-25
--- a/Networks/Selfhosting.md
+++ b/Networks/Selfhosting.md
@ -96,6 +96,12 @@ More and more literature point that a home Internet connection may not be the mo

 #### Domain
 [[#^Top|TOP]]
+
+```ad-info
+title: privacy-friendly domain manager
+[Njalla](https://njal.la/)
+```
+
 Domain management is important for several reasons: email and email routine can only be defined once per domain. As such, email services (self-hosting, email aliasing) need to be run on separate domains.

 For self-hosting, the folllowing domain will be used: **mfxm.fr**
@ -194,9 +200,9 @@ In essence, to run multiple services on the same hardware, a few basic steps nee

 | Consideration | Tool | Description
 |---------------|------|------------
-| <p style="color:cyan">**Compartimentalise services into containers**</p> | **docker** | Creates containers that can be run independently
+| <p style="color:cyan">**Compartimentalise services into containers**</p> | **[[Configuring Docker\|docker]]** | Creates containers that can be run independently
 | <p style="color:turquoise">**Simplify docker commands**</p> | **docker-compose** | Enables to create 'script' for docker commands
-| <p style="color:teal">**Route internet traffic appropriately**</p> | reverse proxy: **nginx**, **Caddy2** | Enables to route addresses to the appropriate containers and manage SSL certificates (and https forcing)
+| <p style="color:teal">**Route internet traffic appropriately**</p> | reverse proxy: **nginx**, **[[Configuring Caddy\|caddy]]** | Enables to route addresses to the appropriate containers and manage SSL certificates (and https forcing)

 &emsp;

@ -325,20 +331,15 @@ Open source CMS solution: [here](https://gohugo.io/)

 | Tool | Self-hosted service | Link to tutorial | Sub-domain
 |------|---------------------|---------------|-------
-<p style="color:orange">**Password manager**</p> | **Bitwarden** | [here](https://cyberhost.uk/selfhost-bitwarden/) | pw-manager
-<p style="color:orangered">**[[NextDNS\|DNS resolver]]**</p> | **AdGuard Home** | [here](https://cyberhost.uk/adguard-setup/) | dns-resolver
-<p style="color:coral">**Note-taking app**</p> | **[Notea](https://cinwell.com/notea/)**, **[Turtl](https://turtlapp.com)**, **[Boost Note](https://boostnote.io)**, **[Trilium](https://github.com/zadam/trilium)** | [Notea](https://cyberhost.uk/notea/), [Turtl with docker](https://github.com/turtl/server#running-the-server) | notes
-<p style="color:lightsalmon"> **Git instance**</p> | **[Gitea](https://gitea.io/en-us/)** | [for Gitea](https://www.techrepublic.com/article/how-to-install-the-self-hosted-git-server-gitea-on-ubuntu-18-04/), [Gitea with docker](https://www.how2shout.com/linux/gitea-on-docker-installation-of-self-hosted-git-service/), [Gitea with docker-compose](https://docs.gitea.io/en-us/install-with-docker/) | git
+<p style="color:orange">Youtube with no ads</p> | **Piped** | [here]([](https://piped-docs.kavin.rocks/docs/self-hosting/)) | videos
+<p style="color:orangered">[[NextDNS\|DNS resolver]]</p> | **AdGuard Home** | [here](https://cyberhost.uk/adguard-setup/) | dns-resolver


 Database: MySQL, MariaDB, Postgres

 | App | Database
 |------|----------
-| **Turtl** | Postgres
-| **Gitea** | MariaDB
 | **AdGuard** | *none*
-| **Bitwarden** | *none*


 ```ad-info
--- a/Investments/Crypto
+++ b/Investments/Crypto
@ -60,7 +60,8 @@ All tasks and to-dos Crypto-related.
 [[#^Top|TOP]]
 &emsp;

- [ ] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-12-24
+- [ ] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-12-31
+- [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-12-24 ✅ 2021-12-24
 - [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-12-17 ✅ 2021-12-18
 - [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-12-10 ✅ 2021-12-18
 - [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-12-03 ✅ 2021-12-18
--- a/Investments/Equity
+++ b/Investments/Equity
@ -60,7 +60,8 @@ Note summarising all tasks and to-dos for Listed Equity investments.
 [[#^Top|TOP]]
 &emsp;

- [ ] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-12-24
+- [ ] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-12-31
+- [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-12-24 ✅ 2021-12-24
 - [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-12-17 ✅ 2021-12-18
 - [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-12-10 ✅ 2021-12-18
 - [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-12-03 ✅ 2021-12-18
--- a/Investments/VC
+++ b/Investments/VC
@ -60,7 +60,8 @@ Tasks and to-dos for VC investments.
 [[#^Top|TOP]]
 &emsp;

- [ ] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-12-24
+- [ ] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-12-31
+- [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-12-24 ✅ 2021-12-24
 - [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-12-17 ✅ 2021-12-18
 - [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-12-10 ✅ 2021-12-18
 - [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-12-03 ✅ 2021-12-18