vault backup: 2023-01-01 17:07:20

2026-06-10 02:01:31 +00:00 · 2023-01-01 17:07:20 +01:00 · 2023-01-01 17:07:20 +01:00 · 67393e3017
commit 67393e3017
parent 8b501c7cf7
34 changed files with 1079 additions and 1100 deletions
--- a/notes/.obsidian/core-plugins-migration.json
+++ b/notes/.obsidian/core-plugins-migration.json
@ -0,0 +1,29 @@
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "page-preview": true,
+  "daily-notes": false,
+  "templates": false,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": false,
+  "starred": false,
+  "markdown-importer": true,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": true,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": false,
+  "canvas": true
+}
--- a/notes/.obsidian/core-plugins.json
+++ b/notes/.obsidian/core-plugins.json
@ -4,6 +4,7 @@
  "switcher",
  "graph",
  "backlink",
+  "canvas",
  "outgoing-link",
  "tag-pane",
  "page-preview",
--- a/notes/.obsidian/plugins/obsidian-activity-history/data.json
+++ b/notes/.obsidian/plugins/obsidian-activity-history/data.json
@ -12,8 +12,8 @@
  "checkpointList": [
    {
      "path": "/",
-      "date": "2022-12-19",
-      "size": 945088
+      "date": "2023-01-01",
+      "size": 945738
    }
  ],
  "activityHistory": [
@ -987,6 +987,18 @@
        {
          "date": "2022-12-19",
          "value": 3932
+        },
+        {
+          "date": "2022-12-21",
+          "value": 582
+        },
+        {
+          "date": "2022-12-22",
+          "value": 0
+        },
+        {
+          "date": "2023-01-01",
+          "value": 68
        }
      ]
    }
--- a/notes/.obsidian/plugins/obsidian-chartsview-plugin/main.js
+++ b/notes/.obsidian/plugins/obsidian-chartsview-plugin/main.js
--- a/notes/.obsidian/plugins/obsidian-chartsview-plugin/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-chartsview-plugin/manifest.json
@ -1,7 +1,7 @@
 {
 	"id": "obsidian-chartsview-plugin",
 	"name": "Charts View",
-	"version": "1.1.9",
+	"version": "1.2.0",
 	"minAppVersion": "0.9.12",
 	"description": "Data visualization solution in Obsidian based on Ant Design Charts.",
 	"author": "caronchen",
--- a/notes/.obsidian/plugins/obsidian-checklist-plugin/main.js
+++ b/notes/.obsidian/plugins/obsidian-checklist-plugin/main.js
@ -5915,9 +5915,9 @@ function set_input_value(input, value) {
 function toggle_class(element2, name, toggle) {
  element2.classList[toggle ? "add" : "remove"](name);
 }
-function custom_event(type, detail, bubbles = false) {
+function custom_event(type, detail, { bubbles = false, cancelable = false } = {}) {
  const e = document.createEvent("CustomEvent");
-  e.initCustomEvent(type, bubbles, false, detail);
+  e.initCustomEvent(type, bubbles, cancelable, detail);
  return e;
 }
 var current_component;
@ -5931,14 +5931,16 @@ function get_current_component() {
 }
 function createEventDispatcher() {
  const component = get_current_component();
-  return (type, detail) => {
+  return (type, detail, { cancelable = false } = {}) => {
    const callbacks = component.$$.callbacks[type];
    if (callbacks) {
-      const event = custom_event(type, detail);
+      const event = custom_event(type, detail, { cancelable });
      callbacks.slice().forEach((fn) => {
        fn.call(component, event);
      });
+      return !event.defaultPrevented;
    }
+    return true;
  };
 }
 var dirty_components = [];
@ -6033,6 +6035,8 @@ function transition_out(block, local, detach2, callback) {
      }
    });
    block.o(local);
+  } else if (callback) {
+    callback();
  }
 }
 var globals = typeof window !== "undefined" ? window : typeof globalThis !== "undefined" ? globalThis : global;
@ -6196,7 +6200,6 @@ var import_obsidian3 = require("obsidian");

 // src/utils/helpers.ts
 var import_obsidian2 = require("obsidian");
-var isMacOS = () => window.navigator.userAgent.includes("Macintosh");
 var classifyString = (str) => {
  const sanitzedGroupName = (str != null ? str : "").replace(/[^A-Za-z0-9]/g, "");
  const dasherizedGroupName = sanitzedGroupName.replace(/^([A-Z])|[\s\._](\w)/g, function(_, p1, p2) {
@ -6229,21 +6232,21 @@ var mapLinkMeta = (linkMeta) => {
    map.set(link.filePath, link);
  return map;
 };
-var setLineTo = (line, setTo) => line.replace(/^(\s*([\-\*]|[0-9]+\.)\s\[)([^\]]+)(\].*$)/, `$1${setTo ? "x" : " "}$4`);
+var setLineTo = (line, setTo) => line.replace(/^((\s|\>)*([\-\*]|[0-9]+\.)\s\[)([^\]]+)(\].*$)/, `$1${setTo ? "x" : " "}$5`);
 var getAllLinesFromFile = (cache) => cache.split(/\r?\n/);
 var combineFileLines = (lines) => lines.join("\n");
 var lineIsValidTodo = (line) => {
-  return /^\s*([\-\*]|[0-9]+\.)\s\[(.{1})\]\s{1,4}\S+/.test(line);
+  return /^(\s|\>)*([\-\*]|[0-9]+\.)\s\[(.{1})\]\s{1,4}\S+/.test(line);
 };
 var extractTextFromTodoLine = (line) => {
  var _a;
-  return (_a = /^\s*([\-\*]|[0-9]+\.)\s\[(.{1})\]\s{1,4}(\S{1}.*)$/.exec(line)) == null ? void 0 : _a[3];
+  return (_a = /^(\s|\>)*([\-\*]|[0-9]+\.)\s\[(.{1})\]\s{1,4}(\S{1}.*)$/.exec(line)) == null ? void 0 : _a[4];
 };
 var getIndentationSpacesFromTodoLine = (line) => {
  var _a, _b, _c;
  return (_c = (_b = (_a = /^(\s*)([\-\*]|[0-9]+\.)\s\[(.{1})\]\s{1,4}(\S+)/.exec(line)) == null ? void 0 : _a[1]) == null ? void 0 : _b.length) != null ? _c : 0;
 };
-var todoLineIsChecked = (line) => /^\s*([\-\*]|[0-9]+\.)\s\[(\S{1})\]/.test(line);
+var todoLineIsChecked = (line) => /^(\s|\>)*([\-\*]|[0-9]+\.)\s\[(\S{1})\]/.test(line);
 var getFileLabelFromName = (filename) => {
  var _a;
  return (_a = /^(.+)\.md$/.exec(filename)) == null ? void 0 : _a[1];
@ -6263,9 +6266,6 @@ var ensureMdExtension = (path) => {
    return `${path}.md`;
  return path;
 };
-var isMetaPressed = (e) => {
-  return isMacOS() ? e.metaKey : e.ctrlKey;
-};
 var getFrontmatterTags = (cache, todoTags = []) => {
  var _a;
  const frontMatterTags = (_a = (0, import_obsidian2.parseFrontMatterTags)(cache == null ? void 0 : cache.frontmatter)) != null ? _a : [];
@ -6293,15 +6293,15 @@ var getFileFromPath = (vault, path) => {

 // src/utils/files.ts
 var navToFile = (app, path, ev, line) => __async(void 0, null, function* () {
-  var _a, _b;
  path = ensureMdExtension(path);
  const file = getFileFromPath(app.vault, path);
  if (!file)
    return;
-  const leaf = isMetaPressed(ev) ? app.workspace.splitActiveLeaf() : app.workspace.getUnpinnedLeaf();
+  const mod = import_obsidian3.Keymap.isModEvent(ev);
+  const leaf = app.workspace.getLeaf(mod);
  yield leaf.openFile(file);
  if (line) {
-    (_b = (_a = app.workspace.getActiveViewOfType(import_obsidian3.MarkdownView)) == null ? void 0 : _a.currentMode) == null ? void 0 : _b.applyScroll(line);
+    app.workspace.getActiveViewOfType(import_obsidian3.MarkdownView).editor.setCursor(line);
  }
 });

@ -6640,8 +6640,7 @@ function create_fragment2(ctx) {
      if (!mounted) {
        dispose = [
          listen(button, "click", ctx[6]),
-          listen(div, "click", ctx[8]),
-          listen(li, "click", ctx[9])
+          listen(div, "click", ctx[8])
        ];
        mounted = true;
      }
@ -6691,6 +6690,8 @@ function instance2($$self, $$props, $$invalidate) {
        navToFile(app, target.dataset.filepath, ev, item2 === null || item2 === void 0 ? void 0 : item2.line);
      } else if (target.dataset.type === "tag") {
      }
+    } else {
+      navToFile(app, item2.filePath, ev, item2 === null || item2 === void 0 ? void 0 : item2.line);
    }
  };
  const click_handler = (ev) => {
@ -6700,44 +6701,42 @@ function instance2($$self, $$props, $$invalidate) {
  function div_binding($$value) {
    binding_callbacks[$$value ? "unshift" : "push"](() => {
      contentDiv = $$value;
-      $$invalidate(3, contentDiv), $$invalidate(0, item);
+      $$invalidate(2, contentDiv), $$invalidate(0, item);
    });
  }
  const click_handler_1 = (ev) => handleClick(ev, item);
-  const click_handler_2 = (ev) => navToFile(app, item.filePath, ev);
  $$self.$$set = ($$props2) => {
    if ("item" in $$props2)
      $$invalidate(0, item = $$props2.item);
    if ("lookAndFeel" in $$props2)
      $$invalidate(1, lookAndFeel = $$props2.lookAndFeel);
    if ("app" in $$props2)
-      $$invalidate(2, app = $$props2.app);
+      $$invalidate(5, app = $$props2.app);
  };
  $$self.$$.update = () => {
-    if ($$self.$$.dirty & 9) {
+    if ($$self.$$.dirty & 5) {
      $: {
        if (contentDiv)
-          $$invalidate(3, contentDiv.innerHTML = item.rawHTML, contentDiv);
+          $$invalidate(2, contentDiv.innerHTML = item.rawHTML, contentDiv);
      }
    }
  };
  return [
    item,
    lookAndFeel,
-    app,
    contentDiv,
    toggleItem,
    handleClick,
+    app,
    click_handler,
    div_binding,
-    click_handler_1,
-    click_handler_2
+    click_handler_1
  ];
 }
 var ChecklistItem = class extends SvelteComponent {
  constructor(options) {
    super();
-    init(this, options, instance2, create_fragment2, safe_not_equal, { item: 0, lookAndFeel: 1, app: 2 }, add_css2);
+    init(this, options, instance2, create_fragment2, safe_not_equal, { item: 0, lookAndFeel: 1, app: 5 }, add_css2);
  }
 };
 var ChecklistItem_default = ChecklistItem;
--- a/notes/.obsidian/plugins/obsidian-checklist-plugin/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-checklist-plugin/manifest.json
@ -1,7 +1,7 @@
 {
 	"id": "obsidian-checklist-plugin",
 	"name": "Checklist",
-	"version": "2.2.10",
+	"version": "2.2.12",
 	"minAppVersion": "0.14.5",
 	"description": "Combines checklists across pages into users sidebar",
 	"author": "delashum",
--- a/notes/.obsidian/plugins/obsidian-checklist-plugin/styles.css
+++ b/notes/.obsidian/plugins/obsidian-checklist-plugin/styles.css
@ -1,49 +1,50 @@
-/* no content */
-.checklist-plugin-main {
-  --checklist-checkboxSize: 20px;
-  --checklist-checkboxCheckedSize: 12px;
-  --checklist-checkboxBorder: 2px solid var(--text-muted);
-  --checklist-checkboxFill: var(--text-muted);
-  --checklist-listItemBorderRadius: 8px;
-  --checklist-listItemMargin: 0 0 12px;
-  --checklist-listItemBackground: var(--interactive-normal);
-  --checklist-listItemBackground--hover: var(--interactive-hover);
-  --checklist-listItemMargin--compact: 0 0 8px;
-  --checklist-listItemBoxShadow: none;
-  --checklist-headerMargin: 0 0 8px;
-  --checklist-headerGap: 4px;
-  --checklist-headerFontSize: 18px;
-  --checklist-headerFontWeight: 600;
-  --checklist-iconSize: 24px;
-  --checklist-iconFill: var(--text-normal);
-  --checklist-iconFill--accent: #777;
-  --checklist-textColor: var(--text-muted);
-  --checklist-accentColor: var(--text-accent);
-  --checklist-accentColor--active: var(--text-accent-hover);
-  --checklist-pageMargin: 0 0 4px;
-  --checklist-loaderSize: 16px;
-  --checklist-loaderBorderColor: var(--text-muted) var(--text-muted) var(--text-normal);
-  --checklist-buttonPadding: 0 5px;
-  --checklist-buttonBoxShadow: none;
-  --checklist-countPadding: 0 6px;
-  --checklist-countBackground: var(--interactive-normal);
-  --checklist-countFontSize: 13px;
-  --checklist-togglePadding: 8px 8px 8px 12px;
-  --checklist-contentPadding: 8px 12px 8px 0;
-  --checklist-contentPadding--compact: 4px 8px;
-  --checklist-togglePadding--compact: 4px 8px;
-  --checklist-countBorderRadius: 4px;
-  --checklist-tagBaseColor: var(--text-faint);
-  --checklist-tagSubColor: #bbb;
-  --checklist-groupMargin: 8px;
-  --checklist-contentFontSize: var(--editor-font-size);
-  --checklist-searchBackground: var(--background-primary);
-}
-
-.checklist-plugin-main button {
-  margin: initial;
-}
-
-.checklist-plugin-main p {
-  margin: initial;
-}
+/* no content */
+.checklist-plugin-main {
+  --checklist-checkboxSize: 20px;
+  --checklist-checkboxCheckedSize: 12px;
+  --checklist-checkboxBorder: 2px solid var(--text-muted);
+  --checklist-checkboxFill: var(--text-muted);
+  --checklist-listItemBorderRadius: 8px;
+  --checklist-listItemMargin: 0 0 12px;
+  --checklist-listItemBackground: var(--interactive-normal);
+  --checklist-listItemBackground--hover: var(--interactive-hover);
+  --checklist-listItemMargin--compact: 0 0 8px;
+  --checklist-listItemBoxShadow: none;
+  --checklist-headerMargin: 0 0 8px;
+  --checklist-headerGap: 4px;
+  --checklist-headerFontSize: 18px;
+  --checklist-headerFontWeight: 600;
+  --checklist-iconSize: 24px;
+  --checklist-iconFill: var(--text-normal);
+  --checklist-iconFill--accent: #777;
+  --checklist-textColor: var(--text-muted);
+  --checklist-accentColor: var(--text-accent);
+  --checklist-accentColor--active: var(--text-accent-hover);
+  --checklist-pageMargin: 0 0 4px;
+  --checklist-loaderSize: 16px;
+  --checklist-loaderBorderColor: var(--text-muted) var(--text-muted) var(--text-normal);
+  --checklist-buttonPadding: 0 5px;
+  --checklist-buttonBoxShadow: none;
+  --checklist-countPadding: 0 6px;
+  --checklist-countBackground: var(--interactive-normal);
+  --checklist-countFontSize: 13px;
+  --checklist-togglePadding: 8px 8px 8px 12px;
+  --checklist-contentPadding: 8px 12px 8px 0;
+  --checklist-contentPadding--compact: 4px 8px;
+  --checklist-togglePadding--compact: 4px 8px;
+  --checklist-countBorderRadius: 4px;
+  --checklist-tagBaseColor: var(--text-faint);
+  --checklist-tagSubColor: #bbb;
+  --checklist-groupMargin: 8px;
+  --checklist-contentFontSize: var(--editor-font-size);
+  --checklist-searchBackground: var(--background-primary);
+}
+
+.checklist-plugin-main button {
+  margin: initial;
+}
+
+.checklist-plugin-main p {
+  margin: initial;
+  word-break: break-word;
+}
--- a/notes/.obsidian/plugins/obsidian-excalidraw-plugin/data.json
+++ b/notes/.obsidian/plugins/obsidian-excalidraw-plugin/data.json
@ -78,7 +78,7 @@
  "mdCSS": "",
  "scriptEngineSettings": {},
  "defaultTrayMode": false,
-  "previousRelease": "1.8.4",
+  "previousRelease": "1.8.7",
  "showReleaseNotes": true,
  "showNewVersionNotification": true,
  "mathjaxSourceURL": "https://cdn.jsdelivr.net/npm/mathjax@3.2.1/es5/tex-svg.js",
--- a/notes/.obsidian/plugins/obsidian-excalidraw-plugin/main.js
+++ b/notes/.obsidian/plugins/obsidian-excalidraw-plugin/main.js
--- a/notes/.obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-excalidraw-plugin/manifest.json
@ -1,8 +1,8 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "1.8.4",
-	"minAppVersion": "0.16.0",
+	"version": "1.8.7",
+	"minAppVersion": "1.0.0",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",
 	"authorUrl": "https://zsolt.blog",
--- a/notes/.obsidian/plugins/obsidian-git/main.js
+++ b/notes/.obsidian/plugins/obsidian-git/main.js
@ -31252,9 +31252,7 @@ var ObsidianGit = class extends import_obsidian23.Plugin {
    let status2;
    let unstagedFiles;
    if (this.gitManager instanceof SimpleGit) {
-      const file = this.app.vault.getAbstractFileByPath(this.conflictOutputFile);
-      if (file != null)
-        await this.app.vault.delete(file);
+      this.mayDeleteConflictFile();
      status2 = await this.updateCachedStatus();
      if (fromAutoBackup && status2.conflicted.length > 0) {
        this.displayError(`Did not commit, because you have conflicts in ${status2.conflicted.length} ${status2.conflicted.length == 1 ? "file" : "files"}. Please resolve them and commit per command.`);
@ -31267,9 +31265,7 @@ var ObsidianGit = class extends import_obsidian23.Plugin {
      this.displayError(`Did not commit, because you have conflicts. Please resolve them and commit per command.`);
      return false;
    } else if (hadConflict) {
-      const file = this.app.vault.getAbstractFileByPath(this.conflictOutputFile);
-      if (file != null)
-        await this.app.vault.delete(file);
+      await this.mayDeleteConflictFile();
      status2 = await this.updateCachedStatus();
      changedFiles = [...status2.changed, ...status2.staged];
    } else {
@ -31346,10 +31342,9 @@ var ObsidianGit = class extends import_obsidian23.Plugin {
    if (!await this.remotesAreSet()) {
      return false;
    }
-    const file = this.app.vault.getAbstractFileByPath(this.conflictOutputFile);
    const hadConflict = this.localStorage.getConflict() === "true";
-    if (this.gitManager instanceof SimpleGit && file)
-      await this.app.vault.delete(file);
+    if (this.gitManager instanceof SimpleGit)
+      await this.mayDeleteConflictFile();
    let status2;
    if (this.gitManager instanceof SimpleGit && (status2 = await this.updateCachedStatus()).conflicted.length > 0) {
      this.displayError(`Cannot push. You have conflicts in ${status2.conflicted.length} ${status2.conflicted.length == 1 ? "file" : "files"}`);
@ -31387,6 +31382,17 @@ var ObsidianGit = class extends import_obsidian23.Plugin {
    }
    return pulledFiles.length != 0;
  }
+  async mayDeleteConflictFile() {
+    const file = this.app.vault.getAbstractFileByPath(this.conflictOutputFile);
+    if (file) {
+      this.app.workspace.iterateAllLeaves((leaf) => {
+        if (leaf.view instanceof import_obsidian23.MarkdownView && leaf.view.file.path == file.path) {
+          leaf.detach();
+        }
+      });
+      await this.app.vault.delete(file);
+    }
+  }
  async stageFile(file) {
    if (!await this.isAllInitialized())
      return false;
@ -31584,7 +31590,10 @@ var ObsidianGit = class extends import_obsidian23.Plugin {
    if (conflicted !== void 0) {
      lines = [
        "# Conflicts",
-        "Please resolve them and commit per command (This file will be deleted before the commit).",
+        "Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`",
+        "(This file will automatically be deleted before commit)",
+        "[[#Additional Instructions]] available below file list",
+        "",
        ...conflicted.map((e) => {
          const file = this.app.vault.getAbstractFileByPath(e);
          if (file instanceof import_obsidian23.TFile) {
@ -31593,7 +31602,18 @@ var ObsidianGit = class extends import_obsidian23.Plugin {
          } else {
            return `- Not a file: ${e}`;
          }
-        })
+        }),
+        `
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+\`\`\`diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+\`\`\``
      ];
    }
    this.writeAndOpenFile(lines == null ? void 0 : lines.join("\n"));
--- a/notes/.obsidian/plugins/obsidian-git/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-git/manifest.json
@ -5,5 +5,5 @@
    "isDesktopOnly": false,
    "fundingUrl": "https://ko-fi.com/vinzent",
    "js": "main.js",
-    "version": "2.13.0"
+    "version": "2.14.0"
 }
--- a/notes/.obsidian/plugins/obsidian-icon-folder/main.js
+++ b/notes/.obsidian/plugins/obsidian-icon-folder/main.js
--- a/notes/.obsidian/plugins/obsidian-icon-folder/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-icon-folder/manifest.json
@ -1,7 +1,7 @@
 {
  "id": "obsidian-icon-folder",
  "name": "Icon Folder",
-  "version": "1.4.3",
+  "version": "1.5.1",
  "minAppVersion": "0.9.12",
  "description": "This plugin allows to add an emoji or an icon to a folder or file.",
  "author": "Florian Woelki",
--- a/notes/.obsidian/plugins/obsidian-latex/main.js
+++ b/notes/.obsidian/plugins/obsidian-latex/main.js
--- a/notes/.obsidian/plugins/obsidian-latex/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-latex/manifest.json
@ -1,7 +1,7 @@
 {
 	"id": "obsidian-latex",
 	"name": "Extended MathJax",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"minAppVersion": "0.12.16",
 	"description": "Adds support for a MathJax preamble and enables additional MathJax extensions for specific domains (chemistry, proofs).",
 	"author": "Xavier Denis",
--- a/notes/.obsidian/plugins/obsidian-linter/data.json
+++ b/notes/.obsidian/plugins/obsidian-linter/data.json
@ -1,6 +1,7 @@
 {
  "ruleConfigs": {},
  "lintOnSave": false,
+  "recordLintOnSaveLogs": false,
  "displayChanged": true,
  "foldersToIgnore": [],
  "linterLocale": "system-default",
--- a/notes/.obsidian/plugins/obsidian-linter/main.js
+++ b/notes/.obsidian/plugins/obsidian-linter/main.js
--- a/notes/.obsidian/plugins/obsidian-linter/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-linter/manifest.json
@ -1,7 +1,7 @@
 {
  "id": "obsidian-linter",
  "name": "Linter",
-  "version": "1.9.1",
+  "version": "1.10.1",
  "minAppVersion": "0.15.6",
  "description": "Formats and styles your notes. It can be used to format YAML tags, aliases, arrays, and metadata; footnotes; headings; spacing; math blocks; regular markdown contents like list, italics, and bold styles; and more with the use of custom rule options as well.",
  "author": "Victor Tao",
--- a/notes/.obsidian/plugins/obsidian-linter/styles.css
+++ b/notes/.obsidian/plugins/obsidian-linter/styles.css
@ -141,3 +141,13 @@
  width: 1px;
  white-space: nowrap;
 }
+
+/**
+* Full-width text areas
+*/
+textarea.full-width {
+  width: 100%;
+  min-height: 10em;
+  margin-top: 0.8em;
+  margin-bottom: 0.8em;
+}
--- a/notes/.obsidian/plugins/obsidian-outliner/main.js
+++ b/notes/.obsidian/plugins/obsidian-outliner/main.js
--- a/notes/.obsidian/plugins/obsidian-outliner/manifest.json
+++ b/notes/.obsidian/plugins/obsidian-outliner/manifest.json
@ -1,10 +1,10 @@
-{
-  "id": "obsidian-outliner",
-  "name": "Outliner",
-  "version": "4.1.1",
-  "minAppVersion": "1.0.0",
-  "description": "Work with your lists like in Workflowy or RoamResearch.",
-  "author": "Viacheslav Slinko",
-  "authorUrl": "https://github.com/vslinko",
-  "isDesktopOnly": false
-}
+{
+  "id": "obsidian-outliner",
+  "name": "Outliner",
+  "version": "4.2.1",
+  "minAppVersion": "1.0.0",
+  "description": "Work with your lists like in Workflowy or RoamResearch.",
+  "author": "Viacheslav Slinko",
+  "authorUrl": "https://github.com/vslinko",
+  "isDesktopOnly": false
+}
--- a/notes/.obsidian/plugins/table-editor-obsidian/manifest.json
+++ b/notes/.obsidian/plugins/table-editor-obsidian/manifest.json
@ -6,6 +6,7 @@
  "description": "Improved table navigation, formatting, manipulation, and formulas",
  "isDesktopOnly": false,
  "minAppVersion": "1.0.0",
-  "version": "0.18.0",
-  "js": "main.js"
+  "version": "0.18.1",
+  "js": "main.js",
+  "donation": "https://buymeacoffee.com/tgrosinger"
 }
--- a/notes/.obsidian/plugins/table-editor-obsidian/styles.css
+++ b/notes/.obsidian/plugins/table-editor-obsidian/styles.css
@ -2,6 +2,11 @@
  --advanced-tables-helper-size: 28px;
 }

+.HyperMD-table-row span.cm-inline-code {
+  font-size: 100%;
+  padding: 0px;
+}
+
 .advanced-tables-buttons>div>.title {
  font-weight: var(--font-medium);
  font-size: var(--nav-item-size);
--- a/notes/.obsidian/plugins/tag-wrangler/main.js
+++ b/notes/.obsidian/plugins/tag-wrangler/main.js
--- a/notes/.obsidian/plugins/tag-wrangler/manifest.json
+++ b/notes/.obsidian/plugins/tag-wrangler/manifest.json
@ -3,7 +3,7 @@
  "name": "Tag Wrangler",
  "author": "PJ Eby",
  "authorUrl": "https://github.com/pjeby",
-  "version": "0.5.5",
+  "version": "0.5.6",
  "minAppVersion": "0.15.9",
  "description": "Rename, merge, toggle, and search tags from the tag pane",
  "isDesktopOnly": false
--- a/notes/.obsidian/plugins/various-complements/data.json
+++ b/notes/.obsidian/plugins/various-complements/data.json
@ -63,30 +63,6 @@
        }
      }
    },
-    "proudění": {
-      "proudění": {
-        "currentFile": {
-          "count": 3,
-          "lastUpdated": 1669023718016
-        }
-      }
-    },
-    "nestacionární": {
-      "nestacionární": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669023696143
-        }
-      }
-    },
-    "Proudění": {
-      "Proudění": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669024231016
-        }
-      }
-    },
    "Objemový tok": {
      "Objemový tok": {
        "internalLink": {
@ -95,242 +71,6 @@
        }
      }
    },
-    "kapalina": {
-      "kapalina": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669045424668
-        }
-      }
-    },
-    "2707kgm^{-3}": {
-      "2707kgm^{-3}": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669056361289
-        }
-      }
-    },
-    "10^{-5}m^3": {
-      "10^{-5}m^3": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669056381500
-        }
-      }
-    },
-    "1ms^{-1}": {
-      "1ms^{-1}": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669057325529
-        }
-      }
-    },
-    "5ms^{-1}": {
-      "5ms^{-1}": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669057469228
-        }
-      }
-    },
-    "3ms^{-1}": {
-      "3ms^{-1}": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669057594109
-        }
-      }
-    },
-    "\\frac12\\Rho": {
-      "\\frac12\\Rho": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669116588351
-        }
-      }
-    },
-    "24ms^{-1}": {
-      "24ms^{-1}": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669116845025
-        }
-      }
-    },
-    "v_1^2-v_2^2": {
-      "v_1^2-v_2^2": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669116912637
-        }
-      }
-    },
-    "Exponenciální funkce": {
-      "Exponenciální funkce": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669118705789
-        }
-      }
-    },
-    "hodiny": {
-      "hodiny": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669195604729
-        }
-      }
-    },
-    "terén": {
-      "terén": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669195726178
-        }
-      }
-    },
-    "zemřelo": {
-      "zemřelo": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669195954085
-        }
-      }
-    },
-    "\\downarrow": {
-      "\\downarrow": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669199405571
-        }
-      }
-    },
-    "EtherChannel": {
-      "EtherChannel": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669309232254
-        },
-        "currentFile": {
-          "count": 2,
-          "lastUpdated": 1669309797225
-        }
-      }
-    },
-    "moderní": {
-      "moderní": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669309782046
-        }
-      }
-    },
-    "Desirable": {
-      "Desirable": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669309866833
-        }
-      }
-    },
-    "Rychlost": {
-      "Rychlost": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669709846577
-        }
-      }
-    },
-    "Jehličková": {
-      "Jehličková": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669710271278
-        }
-      }
-    },
-    "Termální": {
-      "Termální": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669710430672
-        }
-      }
-    },
-    "inkoustová": {
-      "inkoustová": {
-        "currentFile": {
-          "count": 2,
-          "lastUpdated": 1669710496684
-        }
-      }
-    },
-    "piezoelektrické": {
-      "piezoelektrické": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669710582167
-        }
-      }
-    },
-    "manželský": {
-      "manželský": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669806349088
-        }
-      }
-    },
-    "manželství": {
-      "manželství": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669806351088
-        }
-      }
-    },
-    "sňatek": {
-      "sňatek": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669807511792
-        }
-      }
-    },
-    "Dotykové napětí": {
-      "Dotykové napětí": {
-        "internalLink": {
-          "count": 1,
-          "lastUpdated": 1669817646770
-        }
-      }
-    },
-    "Export": {
-      "Export": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669818080842
-        }
-      }
-    },
-    "uteče": {
-      "uteče": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669979190811
-        }
-      }
-    },
-    "Pátek": {
-      "Pátek": {
-        "currentFile": {
-          "count": 1,
-          "lastUpdated": 1669979276476
-        }
-      }
-    },
    "Bernoulliho rovnice": {
      "Bernoulliho rovnice": {
        "internalLink": {
@ -414,8 +154,8 @@
    "cjl/slohy": {
      "cjl/slohy": {
        "frontMatter": {
-          "count": 1,
-          "lastUpdated": 1671008867394
+          "count": 2,
+          "lastUpdated": 1672589181167
        }
      }
    },
--- a/notes/.obsidian/workspace.json
+++ b/notes/.obsidian/workspace.json
@ -4,16 +4,16 @@
    "type": "split",
    "children": [
      {
-        "id": "27ddf618e825dcc4",
+        "id": "18716f90bb5562aa",
        "type": "tabs",
        "children": [
          {
-            "id": "aa230c7153f42ddb",
+            "id": "3afd39b235057984",
            "type": "leaf",
            "state": {
              "type": "markdown",
              "state": {
-                "file": "mat/Funkce/Logaritmus - Substituce.md",
+                "file": "cjl/Slohové práce/Reportáž - V Kotli.md",
                "mode": "source",
                "source": false
              }
@ -77,7 +77,7 @@
            "state": {
              "type": "backlink",
              "state": {
-                "file": "mat/Funkce/Logaritmus - Substituce.md",
+                "file": "cjl/Slohové práce/Reportáž - V Kotli.md",
                "collapseAll": false,
                "extraContext": false,
                "sortOrder": "alphabetical",
@ -94,7 +94,7 @@
            "state": {
              "type": "outgoing-link",
              "state": {
-                "file": "mat/Funkce/Logaritmus - Substituce.md",
+                "file": "cjl/Slohové práce/Reportáž - V Kotli.md",
                "linksCollapsed": false,
                "unlinkedCollapsed": true
              }
@ -141,18 +141,10 @@
            "state": {
              "type": "outline",
              "state": {
-                "file": "mat/Funkce/Logaritmus - Substituce.md"
+                "file": "cjl/Slohové práce/Reportáž - V Kotli.md"
              }
            }
          },
-          {
-            "id": "6646a36080fd99c0",
-            "type": "leaf",
-            "state": {
-              "type": "todo",
-              "state": {}
-            }
-          },
          {
            "id": "3e78ff74b952253b",
            "type": "leaf",
@ -192,6 +184,14 @@
              "type": "review-queue-list-view",
              "state": {}
            }
+          },
+          {
+            "id": "a3ceebcf2fd4cef0",
+            "type": "leaf",
+            "state": {
+              "type": "todo",
+              "state": {}
+            }
          }
        ],
        "currentTab": 12
@ -201,17 +201,32 @@
    "width": 300,
    "collapsed": true
  },
-  "active": "aa230c7153f42ddb",
+  "left-ribbon": {
+    "hiddenItems": {
+      "templater-obsidian:Templater": false,
+      "juggl:Juggl global graph": false,
+      "obsidian-spaced-repetition:Review flashcards": false,
+      "switcher:Open quick switcher": false,
+      "graph:Open graph view": false,
+      "canvas:Create new canvas": false,
+      "command-palette:Open command palette": false,
+      "markdown-importer:Open format converter": false,
+      "breadcrumbs:Breadcrumbs Visualisation": false,
+      "table-editor-obsidian:Advanced Tables Toolbar": false,
+      "obsidian-excalidraw-plugin:New Excalidraw drawing": false
+    }
+  },
+  "active": "3afd39b235057984",
  "lastOpenFiles": [
-    "mat/Funkce/Logaritmus.md",
-    "mat/Funkce/Lineární lomené funkce.md",
-    "mat/Funkce/Logaritmus - Substituce.md",
-    "fyz/Mechanika tekutin/Termodynamika/Pokus - Měření účinnosti varné konvice.md",
-    "fyz/fyz.md",
-    "mat/Lomené výrazy/Lomené výrazy.md",
+    "cjl/Slohové práce/Postavy.md",
+    "cjl/Slohové práce/Vypravování.md",
+    "cjl/Slohové práce/Reportáž - V Kotli.md",
+    "cjl/Slohové práce/Slohové práce.md",
+    "cjl/Slohové práce/Dějová linka.md",
+    "cjl/literatura/slohy/Reportáž.md",
+    "cjl/cjl.md",
    "mat/mat.md",
-    "fyz/Mechanika tekutin/Termodynamika/Termodynamická teplota.md",
-    "fyz/Mechanika tekutin/Termodynamika/Termodynamika.md",
-    "cjl/cjl.md"
+    "mat/Funkce/Logaritmus.md",
+    "dej/dej.md"
  ]
 }
--- a/notes/cjl/Slohové
+++ b/notes/cjl/Slohové
@ -0,0 +1,5 @@
+---
+tags: [cjl/slohy, cjl]
+date: 2023-01-01
+---
+# Reportáž - V Kotli
--- a/notes/cjl/Slohové
+++ b/notes/cjl/Slohové
@ -9,5 +9,6 @@ imagePrefix: 'data/'
 %% Zoottelkeeper: Beginning of the autogenerated index file list  %%
 -  [[cjl/Slohové práce/Dějová linka|Dějová linka]]
 -  [[cjl/Slohové práce/Postavy|Postavy]]
+-  [[cjl/Slohové práce/Reportáž - V Kotli|Reportáž - V Kotli]]
 -  [[cjl/Slohové práce/Vypravování|Vypravování]]
 %% Zoottelkeeper: End of the autogenerated index file list  %%
--- a/notes/dej/moderní/komunismus/Hippies.md
+++ b/notes/dej/moderní/komunismus/Hippies.md
@ -0,0 +1,6 @@
+# Hippies
+- neorganizovaná skupina
+- zdrobnělina výrazu hipster
+- užití drog
+- odpor ke společnosti
+- “volná láska”
--- a/notes/dej/moderní/komunismus/komunismus.md
+++ b/notes/dej/moderní/komunismus/komunismus.md
@ -7,6 +7,7 @@ tags: [dej, dej/komunismus, MOC]
 -  [[dej/moderní/komunismus/České století, Všechnu moc lidu Stalinovi|České století, Všechnu moc lidu Stalinovi]]
 -  [[dej/moderní/komunismus/Československo v šedesátých letech|Československo v šedesátých letech]]
 -  [[dej/moderní/komunismus/Expo 58|Expo 58]]
+-  [[dej/moderní/komunismus/Hippies|Hippies]]
 -  [[dej/moderní/komunismus/Karibská krize|Karibská krize]]
 -  [[dej/moderní/komunismus/Milada Horáková|Milada Horáková]]
 -  [[dej/moderní/komunismus/The Beatles|The Beatles]]
--- a/notes/mat/Funkce/Logaritmus.md
+++ b/notes/mat/Funkce/Logaritmus.md
@ -239,3 +239,38 @@ $\log x=1$
 $x=10$

 $D=\mathbb{R}^+\backslash\{10\}$
+
+---
+
+$\log_7x+\frac{\log_7x^5}{\log_7x}=3$
+$(\log_7x)^2+\log_7x^5=3\log_7x$
+$(\log_7x)^2+5\log_7x=3\log_7x$
+
+$x>0$ $x\ne1$
+$x\in\mathbb{R}^+\backslash\{1\}$
+
+$u=\log_7x$
+$u^2+5u=3u$
+$u^2+2u=0$
+$u(u+2)=0$
+
+$u=0$
+$u=-2$
+
+---
+
+$(2\log_{16}x+1)^2=\log_{16}x+2$
+
+$u=\log_{16}x$
+
+$(2u+1)^2=u+2$
+$4u^2+4u+1-u-2=0$
+$4u^2+3u-1=0$
+$D=25$
+$u_1=1$
+$u_2=\frac14$
+$log_{16}x=\frac14$
+$x=16^\frac14$
+
+$x=\frac1{16}$
+$x=2$