From 21dab012ba29425f281b4464dbd7487944643721 Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Thu, 1 Feb 2024 07:49:42 -0700 Subject: [PATCH] Migrate content to notes and override quartz. --- content/.obsidian/hotkeys.json | 1 - flake.nix | 30 +++++++++++-------- {content => notes}/.obsidian/app.json | 0 .../.obsidian/community-plugins.json | 0 .../.obsidian/core-plugins-migration.json | 0 .../.obsidian/core-plugins.json | 0 {content => notes}/.obsidian/daily-notes.json | 0 .../plugins/obsidian-to-anki-plugin/data.json | 0 .../plugins/obsidian-to-anki-plugin/main.js | 0 .../obsidian-to-anki-plugin/manifest.json | 0 .../obsidian-to-anki-plugin/styles.css | 0 {content => notes}/.obsidian/templates.json | 0 {content => notes}/.obsidian/types.json | 0 {content => notes}/bash/index.md | 0 {content => notes}/bash/robustness.md | 0 {content => notes}/bash/shebang.md | 0 {content => notes}/gawk.md | 0 {content => notes}/index.md | 0 {content => notes}/journal/2024-01-31.md | 0 {content => notes}/posix/index.md | 0 {content => notes}/posix/signals.md | 0 {content => notes}/templates/daily.md | 0 22 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 content/.obsidian/hotkeys.json rename {content => notes}/.obsidian/app.json (100%) rename {content => notes}/.obsidian/community-plugins.json (100%) rename {content => notes}/.obsidian/core-plugins-migration.json (100%) rename {content => notes}/.obsidian/core-plugins.json (100%) rename {content => notes}/.obsidian/daily-notes.json (100%) rename {content => notes}/.obsidian/plugins/obsidian-to-anki-plugin/data.json (100%) rename {content => notes}/.obsidian/plugins/obsidian-to-anki-plugin/main.js (100%) rename {content => notes}/.obsidian/plugins/obsidian-to-anki-plugin/manifest.json (100%) rename {content => notes}/.obsidian/plugins/obsidian-to-anki-plugin/styles.css (100%) rename {content => notes}/.obsidian/templates.json (100%) rename {content => notes}/.obsidian/types.json (100%) rename {content => notes}/bash/index.md (100%) rename {content => notes}/bash/robustness.md (100%) rename {content => notes}/bash/shebang.md (100%) rename {content => notes}/gawk.md (100%) rename {content => notes}/index.md (100%) rename {content => notes}/journal/2024-01-31.md (100%) rename {content => notes}/posix/index.md (100%) rename {content => notes}/posix/signals.md (100%) rename {content => notes}/templates/daily.md (100%) diff --git a/content/.obsidian/hotkeys.json b/content/.obsidian/hotkeys.json deleted file mode 100644 index 9e26dfe..0000000 --- a/content/.obsidian/hotkeys.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/flake.nix b/flake.nix index c7c1ac4..4c8bf0d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,15 +18,14 @@ let pkgs = nixpkgs.legacyPackages.${system}; - quartz = { - src = pkgs.fetchFromGitHub { - owner = "jrpotter"; - repo = "quartz"; - rev = "e2e1053fd45586c19829be224008673b17111e6b"; - hash = pkgs.lib.fakeHash; - }; - nodeDependencies = (pkgs.callPackage ./quartz {}).nodeDependencies; + quartz = pkgs.fetchFromGitHub { + owner = "jrpotter"; + repo = "quartz"; + rev = "8c126e9d21cd0bc90da5f78677d458fc81892af1"; + hash = "sha256-caB9F5lvroQ+ZcvzKW8RnKfzSHjEiYfZUSqZiuaggVs="; }; + + nodeDependencies = (pkgs.callPackage "${quartz}/default.nix" {}).nodeDependencies; in { packages = { @@ -38,20 +37,25 @@ nativeBuildInputs = [ pkgs.nodejs ]; buildPhase = '' - cp -r ${quartz.src} quartz + cp -r ${quartz} quartz cd quartz find -type f -execdir chmod 644 {} + find -type d -execdir chmod 755 {} + - ln -s ${quartz.nodeDependencies}/lib/node_modules ./node_modules - export PATH="${quartz.nodeDependencies}/bin:$PATH" + ln -s ${nodeDependencies}/lib/node_modules ./node_modules + export PATH="${nodeDependencies}/bin:$PATH" - # export npm_config_cache=$PWD - # npx quartz build + rm -r content + cp -r ${./notes} content + cp ${./quartz.config.ts} quartz.config.ts + cp ${./quartz.layout.ts} quartz.layout.ts + + node quartz/bootstrap-cli.mjs build ''; installPhase = '' mkdir $out + cp -r public $out ''; }; diff --git a/content/.obsidian/app.json b/notes/.obsidian/app.json similarity index 100% rename from content/.obsidian/app.json rename to notes/.obsidian/app.json diff --git a/content/.obsidian/community-plugins.json b/notes/.obsidian/community-plugins.json similarity index 100% rename from content/.obsidian/community-plugins.json rename to notes/.obsidian/community-plugins.json diff --git a/content/.obsidian/core-plugins-migration.json b/notes/.obsidian/core-plugins-migration.json similarity index 100% rename from content/.obsidian/core-plugins-migration.json rename to notes/.obsidian/core-plugins-migration.json diff --git a/content/.obsidian/core-plugins.json b/notes/.obsidian/core-plugins.json similarity index 100% rename from content/.obsidian/core-plugins.json rename to notes/.obsidian/core-plugins.json diff --git a/content/.obsidian/daily-notes.json b/notes/.obsidian/daily-notes.json similarity index 100% rename from content/.obsidian/daily-notes.json rename to notes/.obsidian/daily-notes.json diff --git a/content/.obsidian/plugins/obsidian-to-anki-plugin/data.json b/notes/.obsidian/plugins/obsidian-to-anki-plugin/data.json similarity index 100% rename from content/.obsidian/plugins/obsidian-to-anki-plugin/data.json rename to notes/.obsidian/plugins/obsidian-to-anki-plugin/data.json diff --git a/content/.obsidian/plugins/obsidian-to-anki-plugin/main.js b/notes/.obsidian/plugins/obsidian-to-anki-plugin/main.js similarity index 100% rename from content/.obsidian/plugins/obsidian-to-anki-plugin/main.js rename to notes/.obsidian/plugins/obsidian-to-anki-plugin/main.js diff --git a/content/.obsidian/plugins/obsidian-to-anki-plugin/manifest.json b/notes/.obsidian/plugins/obsidian-to-anki-plugin/manifest.json similarity index 100% rename from content/.obsidian/plugins/obsidian-to-anki-plugin/manifest.json rename to notes/.obsidian/plugins/obsidian-to-anki-plugin/manifest.json diff --git a/content/.obsidian/plugins/obsidian-to-anki-plugin/styles.css b/notes/.obsidian/plugins/obsidian-to-anki-plugin/styles.css similarity index 100% rename from content/.obsidian/plugins/obsidian-to-anki-plugin/styles.css rename to notes/.obsidian/plugins/obsidian-to-anki-plugin/styles.css diff --git a/content/.obsidian/templates.json b/notes/.obsidian/templates.json similarity index 100% rename from content/.obsidian/templates.json rename to notes/.obsidian/templates.json diff --git a/content/.obsidian/types.json b/notes/.obsidian/types.json similarity index 100% rename from content/.obsidian/types.json rename to notes/.obsidian/types.json diff --git a/content/bash/index.md b/notes/bash/index.md similarity index 100% rename from content/bash/index.md rename to notes/bash/index.md diff --git a/content/bash/robustness.md b/notes/bash/robustness.md similarity index 100% rename from content/bash/robustness.md rename to notes/bash/robustness.md diff --git a/content/bash/shebang.md b/notes/bash/shebang.md similarity index 100% rename from content/bash/shebang.md rename to notes/bash/shebang.md diff --git a/content/gawk.md b/notes/gawk.md similarity index 100% rename from content/gawk.md rename to notes/gawk.md diff --git a/content/index.md b/notes/index.md similarity index 100% rename from content/index.md rename to notes/index.md diff --git a/content/journal/2024-01-31.md b/notes/journal/2024-01-31.md similarity index 100% rename from content/journal/2024-01-31.md rename to notes/journal/2024-01-31.md diff --git a/content/posix/index.md b/notes/posix/index.md similarity index 100% rename from content/posix/index.md rename to notes/posix/index.md diff --git a/content/posix/signals.md b/notes/posix/signals.md similarity index 100% rename from content/posix/signals.md rename to notes/posix/signals.md diff --git a/content/templates/daily.md b/notes/templates/daily.md similarity index 100% rename from content/templates/daily.md rename to notes/templates/daily.md