4 files changed, 34 insertions, 31 deletions
diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix
index bef06cad7457..713c42a83b33 100644
--- a/users/wpcarro/website/blog/default.nix
+++ b/users/wpcarro/website/blog/default.nix
@@ -6,16 +6,16 @@ let
   inherit (builtins) hasAttr filter readFile;
   inherit (depot.web.blog) post includePost renderPost;
   inherit (depot.users) wpcarro;
-  inherit (pkgs) runCommandNoCC;
 
   config = {
     name = "wpcarro's blog";
     baseUrl = "https://wpcarro.dev/blog";
+    footer = "";
   };
 
   posts = filter includePost (list post (import ./posts.nix));
 
-  rendered = runCommandNoCC "wpcarros-blog" {} ''
+  rendered = pkgs.runCommandNoCC "wpcarros-blog-posts" {} ''
     mkdir -p $out
 
     ${lib.concatStringsSep "\n" (map (post:
@@ -23,41 +23,26 @@ let
     ) posts)}
   '';
 
-  formatDate = date: readFile (runCommandNoCC "date" {} ''
+  formatDate = date: readFile (pkgs.runCommandNoCC "date" {} ''
     date --date='@${toString date}' '+%B %e, %Y' > $out
   '');
 
-  postsList = pkgs.writeText "index.html" ''
-    <div class="max-w-sm md:max-w-prose mx-auto">
-      <section class="pt-8 pb-14">
-        <p class="font-bold pb-4">Personal blog by <a class="font-bold text-blue-600 hover:underline" href="https://wpcarro.dev">wpcarro</a>.</p>
-        <p class="text-gray-500">&gt; Half-baked musings lossily encoded.</p>
-        <p class="text-gray-500">&gt; - misc reviewer</p>
-      </section>
-      <ul>
-        ${lib.concatStringsSep "\n" (map (post: ''
-          <li class="pb-10">
-            <h2 class="text-bold font-2xl ">
-              <a class="font-bold text-blue-600 hover:underline" href="${config.baseUrl}/${post.key}.html">
-                ${post.title}
-              </a>
-            </h2>
-            <p class="text-gray-500">
-              ${formatDate post.date}
-            </p>
-          </li>
-        '') posts)}
-      </ul>
-    </div>
-  '';
+  postsHtml = readFile (pkgs.substituteAll {
+    src = ./fragments/posts.html;
+    postsHtml = lib.concatStringsSep "\n" (map toPostHtml posts);
+  });
+
+  toPostHtml = post: readFile (pkgs.substituteAll {
+    src = ./fragments/post.html;
+    postUrl = "${config.baseUrl}/${post.key}.html";
+    postTitle = post.title;
+    postDate = formatDate post.date;
+  });
 in {
   inherit posts rendered config;
 
-  root = runCommandNoCC "wpcarros-blog" {} ''
+  root = pkgs.runCommandNoCC "wpcarros-blog" {} ''
     mkdir -p $out
-
-    cat ${wpcarro.website.header} \
-        ${postsList} \
-        ${wpcarro.website.addendum} > $out/index.html
+    cp ${wpcarro.website.render postsHtml} $out/index.html
   '';
 }
diff --git a/users/wpcarro/website/blog/fragments/.skip-subtree b/users/wpcarro/website/blog/fragments/.skip-subtree
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/users/wpcarro/website/blog/fragments/.skip-subtree
diff --git a/users/wpcarro/website/blog/fragments/post.html b/users/wpcarro/website/blog/fragments/post.html
new file mode 100644
index 000000000000..44593094ecdf
--- /dev/null
+++ b/users/wpcarro/website/blog/fragments/post.html
@@ -0,0 +1,8 @@
+<li class="pb-6 md:pb-10">
+  <h2 class="text-bold text-xl">
+    <a class="font-bold text-blue-600 hover:underline" href="@postUrl@">
+      @postTitle@
+    </a>
+  </h2>
+  <p class="text-gray-500">@postDate@</p>
+</li>
diff --git a/users/wpcarro/website/blog/fragments/posts.html b/users/wpcarro/website/blog/fragments/posts.html
new file mode 100644
index 000000000000..699b28f366c0
--- /dev/null
+++ b/users/wpcarro/website/blog/fragments/posts.html
@@ -0,0 +1,10 @@
+<div class="max-w-sm md:max-w-prose mx-auto">
+  <section class="pt-8 pb-14">
+    <p class="font-bold pb-3 text-xl">
+      Personal blog by <a class="font-bold text-blue-600 hover:underline" href="https://wpcarro.dev">wpcarro</a>.
+    </p>
+    <p class="text-gray-500">&gt; Half-baked musings lossily encoded.</p>
+    <p class="text-gray-500">&gt; - misc reviewer</p>
+  </section>
+  <ul>@postsHtml@</ul>
+</div>