fix(wpcarro/blog): Fix broken post links r/3484

TL;DR:
- copy rendered posts to $out/posts
- update postUrl attr
- remove unused attrs

Change-Id: I027c20d6244e4626128788ad9aa1f1aad7855f32
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4723
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI

2 files changed, 7 insertions, 10 deletions

diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix
index 713c42a83b..7056b026a2 100644
--- a/users/wpcarro/website/blog/default.nix
+++ b/users/wpcarro/website/blog/default.nix
@@ -34,15 +34,12 @@ let
 
   toPostHtml = post: readFile (pkgs.substituteAll {
     src = ./fragments/post.html;
-    postUrl = "${config.baseUrl}/${post.key}.html";
+    postUrl = "${config.baseUrl}/posts/${post.key}.html";
     postTitle = post.title;
     postDate = formatDate post.date;
   });
-in {
-  inherit posts rendered config;
-
-  root = pkgs.runCommandNoCC "wpcarros-blog" {} ''
-    mkdir -p $out
-    cp ${wpcarro.website.render postsHtml} $out/index.html
-  '';
-}
+in pkgs.runCommandNoCC "wpcarros-blog" {} ''
+  mkdir -p $out
+  cp ${wpcarro.website.render postsHtml} $out/index.html
+  cp -r ${rendered} $out/posts
+''
diff --git a/users/wpcarro/website/default.nix b/users/wpcarro/website/default.nix
index e8f2161792..b20de562ab 100644
--- a/users/wpcarro/website/default.nix
+++ b/users/wpcarro/website/default.nix
@@ -22,6 +22,6 @@ in {
     cp -r ${wpcarro.website.habit-screens} $out/habits/index.html
 
     # /blog
-    cp -r ${wpcarro.website.blog.root} $out/blog
+    cp -r ${wpcarro.website.blog} $out/blog
   '';
 }