Move blog into website/blog

Nest the blog work within the website directory.

40 files changed, 2 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index bcfdd838147a..35c8aaaf726c 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 991f2ab3e297..a7e388dd7125 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 ebe79e096c63..1a83264e8f73 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
index b80e28b4b815..b80e28b4b815 100644
--- a/blog/.envrc
+++ b/website/blog/.envrc
diff --git a/blog/archetypes/default.md b/website/blog/archetypes/default.md
index 00e77bd79be4..00e77bd79be4 100644
--- a/blog/archetypes/default.md
+++ b/website/blog/archetypes/default.md
diff --git a/blog/config.toml b/website/blog/config.toml
index de67cf19cc69..de67cf19cc69 100644
--- a/blog/config.toml
+++ b/website/blog/config.toml
diff --git a/blog/content/english/caffeine.md b/website/blog/content/english/caffeine.md
index 9c3dbac0f120..9c3dbac0f120 100644
--- a/blog/content/english/caffeine.md
+++ b/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
index c8efbf38052d..c8efbf38052d 100644
--- a/blog/content/english/cell-phone-experiment.md
+++ b/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
index a436d4de25eb..a436d4de25eb 100644
--- a/blog/content/english/lets-learn-nix-caching.md
+++ b/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
index 2e12a6b06fcc..2e12a6b06fcc 100644
--- a/blog/content/english/lets-learn-nix-determinism-vs-reproducibility.md
+++ b/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
index 084fb19e4406..084fb19e4406 100644
--- a/blog/content/english/lets-learn-nix-dotfiles.md
+++ b/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
index c80892164dbe..c80892164dbe 100644
--- a/blog/content/english/lets-learn-nix-tutorial-reproducibility.md
+++ b/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
index a7c9a22e422e..a7c9a22e422e 100644
--- a/blog/content/english/lets-learn-nix.md
+++ b/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
index ff0fe70205da..ff0fe70205da 100644
--- a/blog/content/english/nix-and-hugo.md
+++ b/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
index 1705541d820c..1705541d820c 100644
--- a/blog/content/english/self-hosting.md
+++ b/website/blog/content/english/self-hosting.md
diff --git a/blog/default.nix b/website/blog/default.nix
index 437f5cc108d7..437f5cc108d7 100644
--- a/blog/default.nix
+++ b/website/blog/default.nix
diff --git a/blog/shell.nix b/website/blog/shell.nix
index d1b4f49942bc..d1b4f49942bc 100644
--- a/blog/shell.nix
+++ b/website/blog/shell.nix
diff --git a/blog/themes/tailwind/.gitignore b/website/blog/themes/tailwind/.gitignore
index eb1a2c123ccc..eb1a2c123ccc 100644
--- a/blog/themes/tailwind/.gitignore
+++ b/website/blog/themes/tailwind/.gitignore
diff --git a/blog/themes/tailwind/archetypes/default.md b/website/blog/themes/tailwind/archetypes/default.md
index f7e5e03d9ebd..f7e5e03d9ebd 100644
--- a/blog/themes/tailwind/archetypes/default.md
+++ b/website/blog/themes/tailwind/archetypes/default.md
diff --git a/blog/themes/tailwind/i18n/en.yaml b/website/blog/themes/tailwind/i18n/en.yaml
index 8326be14acf4..8326be14acf4 100644
--- a/blog/themes/tailwind/i18n/en.yaml
+++ b/website/blog/themes/tailwind/i18n/en.yaml
diff --git a/blog/themes/tailwind/images/screenshot.png b/website/blog/themes/tailwind/images/screenshot.png
index 3ca0b46b2d2b..3ca0b46b2d2b 100644
--- a/blog/themes/tailwind/images/screenshot.png
+++ b/website/blog/themes/tailwind/images/screenshot.png
Binary files differdiff --git a/blog/themes/tailwind/images/tn.png b/website/blog/themes/tailwind/images/tn.png
index 785504cd0176..785504cd0176 100644
--- a/blog/themes/tailwind/images/tn.png
+++ b/website/blog/themes/tailwind/images/tn.png
Binary files differdiff --git a/blog/themes/tailwind/layouts/404.html b/website/blog/themes/tailwind/layouts/404.html
index afa69fec743e..afa69fec743e 100644
--- a/blog/themes/tailwind/layouts/404.html
+++ b/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
index 2cc783dae038..2cc783dae038 100644
--- a/blog/themes/tailwind/layouts/_default/baseof.html
+++ b/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
index d781ce752a4a..d781ce752a4a 100644
--- a/blog/themes/tailwind/layouts/_default/list.html
+++ b/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
index e4485f324e9c..e4485f324e9c 100644
--- a/blog/themes/tailwind/layouts/_default/single.html
+++ b/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
index 4869c466b613..4869c466b613 100644
--- a/blog/themes/tailwind/layouts/index.html
+++ b/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
index 4064d5256137..4064d5256137 100644
--- a/blog/themes/tailwind/layouts/partials/back-home.html
+++ b/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
index 0ebd4ca7e9b4..0ebd4ca7e9b4 100644
--- a/blog/themes/tailwind/layouts/partials/posts.html
+++ b/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
index 76da49ed0a09..76da49ed0a09 100644
--- a/blog/themes/tailwind/layouts/taxonomy/terms.html
+++ b/website/blog/themes/tailwind/layouts/taxonomy/terms.html
diff --git a/blog/themes/tailwind/license.md b/website/blog/themes/tailwind/license.md
index 196326bb0e7e..196326bb0e7e 100644
--- a/blog/themes/tailwind/license.md
+++ b/website/blog/themes/tailwind/license.md
diff --git a/blog/themes/tailwind/package.json b/website/blog/themes/tailwind/package.json
index 86bb50f9490a..86bb50f9490a 100644
--- a/blog/themes/tailwind/package.json
+++ b/website/blog/themes/tailwind/package.json
diff --git a/blog/themes/tailwind/postcss.config.js b/website/blog/themes/tailwind/postcss.config.js
index 6efcb774fa7c..6efcb774fa7c 100644
--- a/blog/themes/tailwind/postcss.config.js
+++ b/website/blog/themes/tailwind/postcss.config.js
diff --git a/blog/themes/tailwind/readme.md b/website/blog/themes/tailwind/readme.md
index cdb69a619730..cdb69a619730 100644
--- a/blog/themes/tailwind/readme.md
+++ b/website/blog/themes/tailwind/readme.md
diff --git a/blog/themes/tailwind/scss/theme.scss b/website/blog/themes/tailwind/scss/theme.scss
index 9da9261b63a1..9da9261b63a1 100644
--- a/blog/themes/tailwind/scss/theme.scss
+++ b/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
index 5e903f4fd7bc..5e903f4fd7bc 100644
--- a/blog/themes/tailwind/static/css/chroma.dracula.css
+++ b/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
index 4d9cc992fd36..4d9cc992fd36 100644
--- a/blog/themes/tailwind/static/css/theme.css
+++ b/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
index 4b945386a001..4b945386a001 100644
--- a/blog/themes/tailwind/static/images/404-background.png
+++ b/website/blog/themes/tailwind/static/images/404-background.png
Binary files differdiff --git a/blog/themes/tailwind/tailwind.config.js b/website/blog/themes/tailwind/tailwind.config.js
index f3714704df46..f3714704df46 100644
--- a/blog/themes/tailwind/tailwind.config.js
+++ b/website/blog/themes/tailwind/tailwind.config.js
diff --git a/blog/themes/tailwind/theme.toml b/website/blog/themes/tailwind/theme.toml
index bfdefa7160df..bfdefa7160df 100644
--- a/blog/themes/tailwind/theme.toml
+++ b/website/blog/themes/tailwind/theme.toml