From 95e761e59b739c1cd702f70757225d7d01325284 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Fri, 20 Mar 2020 00:46:29 +0000 Subject: [PATCH] Move blog into website/blog Nest the blog work within the website directory. --- .gitignore | 2 +- default.nix | 1 - nixos/socrates/configuration.nix | 2 +- {blog => website/blog}/.envrc | 0 {blog => website/blog}/archetypes/default.md | 0 {blog => website/blog}/config.toml | 0 {blog => website/blog}/content/english/caffeine.md | 0 .../blog}/content/english/cell-phone-experiment.md | 0 .../blog}/content/english/lets-learn-nix-caching.md | 0 ...lets-learn-nix-determinism-vs-reproducibility.md | 0 .../content/english/lets-learn-nix-dotfiles.md | 0 .../lets-learn-nix-tutorial-reproducibility.md | 0 .../blog}/content/english/lets-learn-nix.md | 0 .../blog}/content/english/nix-and-hugo.md | 0 .../blog}/content/english/self-hosting.md | 0 {blog => website/blog}/default.nix | 0 {blog => website/blog}/shell.nix | 0 {blog => website/blog}/themes/tailwind/.gitignore | 0 .../blog}/themes/tailwind/archetypes/default.md | 0 {blog => website/blog}/themes/tailwind/i18n/en.yaml | 0 .../blog}/themes/tailwind/images/screenshot.png | Bin .../blog}/themes/tailwind/images/tn.png | Bin .../blog}/themes/tailwind/layouts/404.html | 0 .../themes/tailwind/layouts/_default/baseof.html | 0 .../themes/tailwind/layouts/_default/list.html | 0 .../themes/tailwind/layouts/_default/single.html | 0 .../blog}/themes/tailwind/layouts/index.html | 0 .../themes/tailwind/layouts/partials/back-home.html | 0 .../themes/tailwind/layouts/partials/posts.html | 0 .../themes/tailwind/layouts/taxonomy/terms.html | 0 {blog => website/blog}/themes/tailwind/license.md | 0 {blog => website/blog}/themes/tailwind/package.json | 0 .../blog}/themes/tailwind/postcss.config.js | 0 {blog => website/blog}/themes/tailwind/readme.md | 0 .../blog}/themes/tailwind/scss/theme.scss | 0 .../themes/tailwind/static/css/chroma.dracula.css | 0 .../blog}/themes/tailwind/static/css/theme.css | 0 .../tailwind/static/images/404-background.png | Bin .../blog}/themes/tailwind/tailwind.config.js | 0 {blog => website/blog}/themes/tailwind/theme.toml | 0 40 files changed, 2 insertions(+), 3 deletions(-) rename {blog => website/blog}/.envrc (100%) rename {blog => website/blog}/archetypes/default.md (100%) rename {blog => website/blog}/config.toml (100%) rename {blog => website/blog}/content/english/caffeine.md (100%) rename {blog => website/blog}/content/english/cell-phone-experiment.md (100%) rename {blog => website/blog}/content/english/lets-learn-nix-caching.md (100%) rename {blog => website/blog}/content/english/lets-learn-nix-determinism-vs-reproducibility.md (100%) rename {blog => website/blog}/content/english/lets-learn-nix-dotfiles.md (100%) rename {blog => website/blog}/content/english/lets-learn-nix-tutorial-reproducibility.md (100%) rename {blog => website/blog}/content/english/lets-learn-nix.md (100%) rename {blog => website/blog}/content/english/nix-and-hugo.md (100%) rename {blog => website/blog}/content/english/self-hosting.md (100%) rename {blog => website/blog}/default.nix (100%) rename {blog => website/blog}/shell.nix (100%) rename {blog => website/blog}/themes/tailwind/.gitignore (100%) rename {blog => website/blog}/themes/tailwind/archetypes/default.md (100%) rename {blog => website/blog}/themes/tailwind/i18n/en.yaml (100%) rename {blog => website/blog}/themes/tailwind/images/screenshot.png (100%) rename {blog => website/blog}/themes/tailwind/images/tn.png (100%) rename {blog => website/blog}/themes/tailwind/layouts/404.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/_default/baseof.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/_default/list.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/_default/single.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/index.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/partials/back-home.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/partials/posts.html (100%) rename {blog => website/blog}/themes/tailwind/layouts/taxonomy/terms.html (100%) rename {blog => website/blog}/themes/tailwind/license.md (100%) rename {blog => website/blog}/themes/tailwind/package.json (100%) rename {blog => website/blog}/themes/tailwind/postcss.config.js (100%) rename {blog => website/blog}/themes/tailwind/readme.md (100%) rename {blog => website/blog}/themes/tailwind/scss/theme.scss (100%) rename {blog => website/blog}/themes/tailwind/static/css/chroma.dracula.css (100%) rename {blog => website/blog}/themes/tailwind/static/css/theme.css (100%) rename {blog => website/blog}/themes/tailwind/static/images/404-background.png (100%) rename {blog => website/blog}/themes/tailwind/tailwind.config.js (100%) rename {blog => website/blog}/themes/tailwind/theme.toml (100%) diff --git a/.gitignore b/.gitignore index bcfdd8381..35c8aaaf7 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ __pycache__ node_modules/ /configs/.config/fish/config.fish /configs/.config/fish/fish_variables -/blog/public/ +/website/blog/public/ # ReasonML .merlin diff --git a/default.nix b/default.nix index 991f2ab3e..a7e388dd7 100644 --- a/default.nix +++ b/default.nix @@ -13,7 +13,6 @@ in { learn = readTree ./learn; sandbox = readTree ./sandbox; website = readTree ./website; - blog = readTree ./blog; lisp = readTree ./lisp; gopkgs = readTree ./gopkgs; monzo_ynab = readTree ./monzo_ynab; diff --git a/nixos/socrates/configuration.nix b/nixos/socrates/configuration.nix index ebe79e096..1a83264e8 100644 --- a/nixos/socrates/configuration.nix +++ b/nixos/socrates/configuration.nix @@ -167,7 +167,7 @@ in { "blog.wpcarro.dev" = { addSSL = true; enableACME = true; - root = briefcase.blog; + root = briefcase.website.blog; }; "sandbox.wpcarro.dev" = { addSSL = true; diff --git a/blog/.envrc b/website/blog/.envrc similarity index 100% rename from blog/.envrc rename to website/blog/.envrc diff --git a/blog/archetypes/default.md b/website/blog/archetypes/default.md similarity index 100% rename from blog/archetypes/default.md rename to website/blog/archetypes/default.md diff --git a/blog/config.toml b/website/blog/config.toml similarity index 100% rename from blog/config.toml rename to website/blog/config.toml diff --git a/blog/content/english/caffeine.md b/website/blog/content/english/caffeine.md similarity index 100% rename from blog/content/english/caffeine.md rename to website/blog/content/english/caffeine.md diff --git a/blog/content/english/cell-phone-experiment.md b/website/blog/content/english/cell-phone-experiment.md similarity index 100% rename from blog/content/english/cell-phone-experiment.md rename to website/blog/content/english/cell-phone-experiment.md diff --git a/blog/content/english/lets-learn-nix-caching.md b/website/blog/content/english/lets-learn-nix-caching.md similarity index 100% rename from blog/content/english/lets-learn-nix-caching.md rename to website/blog/content/english/lets-learn-nix-caching.md diff --git a/blog/content/english/lets-learn-nix-determinism-vs-reproducibility.md b/website/blog/content/english/lets-learn-nix-determinism-vs-reproducibility.md similarity index 100% rename from blog/content/english/lets-learn-nix-determinism-vs-reproducibility.md rename to website/blog/content/english/lets-learn-nix-determinism-vs-reproducibility.md diff --git a/blog/content/english/lets-learn-nix-dotfiles.md b/website/blog/content/english/lets-learn-nix-dotfiles.md similarity index 100% rename from blog/content/english/lets-learn-nix-dotfiles.md rename to website/blog/content/english/lets-learn-nix-dotfiles.md diff --git a/blog/content/english/lets-learn-nix-tutorial-reproducibility.md b/website/blog/content/english/lets-learn-nix-tutorial-reproducibility.md similarity index 100% rename from blog/content/english/lets-learn-nix-tutorial-reproducibility.md rename to website/blog/content/english/lets-learn-nix-tutorial-reproducibility.md diff --git a/blog/content/english/lets-learn-nix.md b/website/blog/content/english/lets-learn-nix.md similarity index 100% rename from blog/content/english/lets-learn-nix.md rename to website/blog/content/english/lets-learn-nix.md diff --git a/blog/content/english/nix-and-hugo.md b/website/blog/content/english/nix-and-hugo.md similarity index 100% rename from blog/content/english/nix-and-hugo.md rename to website/blog/content/english/nix-and-hugo.md diff --git a/blog/content/english/self-hosting.md b/website/blog/content/english/self-hosting.md similarity index 100% rename from blog/content/english/self-hosting.md rename to website/blog/content/english/self-hosting.md diff --git a/blog/default.nix b/website/blog/default.nix similarity index 100% rename from blog/default.nix rename to website/blog/default.nix diff --git a/blog/shell.nix b/website/blog/shell.nix similarity index 100% rename from blog/shell.nix rename to website/blog/shell.nix diff --git a/blog/themes/tailwind/.gitignore b/website/blog/themes/tailwind/.gitignore similarity index 100% rename from blog/themes/tailwind/.gitignore rename to website/blog/themes/tailwind/.gitignore diff --git a/blog/themes/tailwind/archetypes/default.md b/website/blog/themes/tailwind/archetypes/default.md similarity index 100% rename from blog/themes/tailwind/archetypes/default.md rename to website/blog/themes/tailwind/archetypes/default.md diff --git a/blog/themes/tailwind/i18n/en.yaml b/website/blog/themes/tailwind/i18n/en.yaml similarity index 100% rename from blog/themes/tailwind/i18n/en.yaml rename to website/blog/themes/tailwind/i18n/en.yaml diff --git a/blog/themes/tailwind/images/screenshot.png b/website/blog/themes/tailwind/images/screenshot.png similarity index 100% rename from blog/themes/tailwind/images/screenshot.png rename to website/blog/themes/tailwind/images/screenshot.png diff --git a/blog/themes/tailwind/images/tn.png b/website/blog/themes/tailwind/images/tn.png similarity index 100% rename from blog/themes/tailwind/images/tn.png rename to website/blog/themes/tailwind/images/tn.png diff --git a/blog/themes/tailwind/layouts/404.html b/website/blog/themes/tailwind/layouts/404.html similarity index 100% rename from blog/themes/tailwind/layouts/404.html rename to website/blog/themes/tailwind/layouts/404.html diff --git a/blog/themes/tailwind/layouts/_default/baseof.html b/website/blog/themes/tailwind/layouts/_default/baseof.html similarity index 100% rename from blog/themes/tailwind/layouts/_default/baseof.html rename to website/blog/themes/tailwind/layouts/_default/baseof.html diff --git a/blog/themes/tailwind/layouts/_default/list.html b/website/blog/themes/tailwind/layouts/_default/list.html similarity index 100% rename from blog/themes/tailwind/layouts/_default/list.html rename to website/blog/themes/tailwind/layouts/_default/list.html diff --git a/blog/themes/tailwind/layouts/_default/single.html b/website/blog/themes/tailwind/layouts/_default/single.html similarity index 100% rename from blog/themes/tailwind/layouts/_default/single.html rename to website/blog/themes/tailwind/layouts/_default/single.html diff --git a/blog/themes/tailwind/layouts/index.html b/website/blog/themes/tailwind/layouts/index.html similarity index 100% rename from blog/themes/tailwind/layouts/index.html rename to website/blog/themes/tailwind/layouts/index.html diff --git a/blog/themes/tailwind/layouts/partials/back-home.html b/website/blog/themes/tailwind/layouts/partials/back-home.html similarity index 100% rename from blog/themes/tailwind/layouts/partials/back-home.html rename to website/blog/themes/tailwind/layouts/partials/back-home.html diff --git a/blog/themes/tailwind/layouts/partials/posts.html b/website/blog/themes/tailwind/layouts/partials/posts.html similarity index 100% rename from blog/themes/tailwind/layouts/partials/posts.html rename to website/blog/themes/tailwind/layouts/partials/posts.html diff --git a/blog/themes/tailwind/layouts/taxonomy/terms.html b/website/blog/themes/tailwind/layouts/taxonomy/terms.html similarity index 100% rename from blog/themes/tailwind/layouts/taxonomy/terms.html rename to website/blog/themes/tailwind/layouts/taxonomy/terms.html diff --git a/blog/themes/tailwind/license.md b/website/blog/themes/tailwind/license.md similarity index 100% rename from blog/themes/tailwind/license.md rename to website/blog/themes/tailwind/license.md diff --git a/blog/themes/tailwind/package.json b/website/blog/themes/tailwind/package.json similarity index 100% rename from blog/themes/tailwind/package.json rename to website/blog/themes/tailwind/package.json diff --git a/blog/themes/tailwind/postcss.config.js b/website/blog/themes/tailwind/postcss.config.js similarity index 100% rename from blog/themes/tailwind/postcss.config.js rename to website/blog/themes/tailwind/postcss.config.js diff --git a/blog/themes/tailwind/readme.md b/website/blog/themes/tailwind/readme.md similarity index 100% rename from blog/themes/tailwind/readme.md rename to website/blog/themes/tailwind/readme.md diff --git a/blog/themes/tailwind/scss/theme.scss b/website/blog/themes/tailwind/scss/theme.scss similarity index 100% rename from blog/themes/tailwind/scss/theme.scss rename to website/blog/themes/tailwind/scss/theme.scss diff --git a/blog/themes/tailwind/static/css/chroma.dracula.css b/website/blog/themes/tailwind/static/css/chroma.dracula.css similarity index 100% rename from blog/themes/tailwind/static/css/chroma.dracula.css rename to website/blog/themes/tailwind/static/css/chroma.dracula.css diff --git a/blog/themes/tailwind/static/css/theme.css b/website/blog/themes/tailwind/static/css/theme.css similarity index 100% rename from blog/themes/tailwind/static/css/theme.css rename to website/blog/themes/tailwind/static/css/theme.css diff --git a/blog/themes/tailwind/static/images/404-background.png b/website/blog/themes/tailwind/static/images/404-background.png similarity index 100% rename from blog/themes/tailwind/static/images/404-background.png rename to website/blog/themes/tailwind/static/images/404-background.png diff --git a/blog/themes/tailwind/tailwind.config.js b/website/blog/themes/tailwind/tailwind.config.js similarity index 100% rename from blog/themes/tailwind/tailwind.config.js rename to website/blog/themes/tailwind/tailwind.config.js diff --git a/blog/themes/tailwind/theme.toml b/website/blog/themes/tailwind/theme.toml similarity index 100% rename from blog/themes/tailwind/theme.toml rename to website/blog/themes/tailwind/theme.toml