diff options
-rw-r--r-- | users/wpcarro/website/blog/default.nix | 15 | ||||
-rw-r--r-- | users/wpcarro/website/default.nix | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix index 713c42a83b33..7056b026a21a 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 e8f2161792ca..b20de562ab6f 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 ''; } |