diff --git a/users/wpcarro/website/blog/default.nix b/users/wpcarro/website/blog/default.nix index bef06cad7..713c42a83 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" '' -
-
-

Personal blog by wpcarro.

-

> Half-baked musings lossily encoded.

-

> - misc reviewer

-
- -
- ''; + 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 000000000..e69de29bb diff --git a/users/wpcarro/website/blog/fragments/post.html b/users/wpcarro/website/blog/fragments/post.html new file mode 100644 index 000000000..44593094e --- /dev/null +++ b/users/wpcarro/website/blog/fragments/post.html @@ -0,0 +1,8 @@ +
  • +

    + + @postTitle@ + +

    +

    @postDate@

    +
    • diff --git a/users/wpcarro/website/blog/fragments/posts.html b/users/wpcarro/website/blog/fragments/posts.html new file mode 100644 index 000000000..699b28f36 --- /dev/null +++ b/users/wpcarro/website/blog/fragments/posts.html @@ -0,0 +1,10 @@ +
    +
    +

    + Personal blog by wpcarro. +

    +

    > Half-baked musings lossily encoded.

    +

    > - misc reviewer

    +
    + +
    diff --git a/users/wpcarro/website/default.nix b/users/wpcarro/website/default.nix index 60d8dc19e..e8f216179 100644 --- a/users/wpcarro/website/default.nix +++ b/users/wpcarro/website/default.nix @@ -1,27 +1,27 @@ { pkgs, depot, ... }: -rec { +let + inherit (builtins) readFile; inherit (depot.users) wpcarro; - header = "${./fragments/header.html}"; - footer = "${./fragments/footer.html}"; - addendum = "${./fragments/addendum.html}"; - - root = pkgs.stdenv.mkDerivation { - name = "wpcarro.dev"; - src = builtins.path { path = ./.; name = "website"; }; - installPhase = '' - mkdir -p $out - - cat ${header} \ - ${./fragments/homepage.html} \ - ${footer} \ - ${addendum} > $out/index.html - - mkdir -p $out/habits - cp -r ${wpcarro.website.habit-screens} $out/habits/index.html - - cp -r ${wpcarro.website.blog.root} $out/blog - ''; + render = contentHtml: pkgs.substituteAll { + inherit contentHtml; + src = ./fragments/template.html; }; +in { + inherit render; + + root = pkgs.runCommandNoCC "wpcarro.dev" {} '' + mkdir -p $out + + # / + cp ${render (readFile ./fragments/homepage.html)} $out/index.html + + # /habits + mkdir -p $out/habits + cp -r ${wpcarro.website.habit-screens} $out/habits/index.html + + # /blog + cp -r ${wpcarro.website.blog.root} $out/blog + ''; } diff --git a/users/wpcarro/website/fragments/addendum.html b/users/wpcarro/website/fragments/addendum.html deleted file mode 100644 index 9623db9bf..000000000 --- a/users/wpcarro/website/fragments/addendum.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/users/wpcarro/website/fragments/footer.html b/users/wpcarro/website/fragments/footer.html deleted file mode 100644 index c0c9a3d7c..000000000 --- a/users/wpcarro/website/fragments/footer.html +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/users/wpcarro/website/fragments/header.html b/users/wpcarro/website/fragments/template.html similarity index 61% rename from users/wpcarro/website/fragments/header.html rename to users/wpcarro/website/fragments/template.html index 42230ded1..96d19e849 100644 --- a/users/wpcarro/website/fragments/header.html +++ b/users/wpcarro/website/fragments/template.html @@ -55,3 +55,42 @@
    + @contentHtml@ + +
    + + +