From 08d46ad293264a7c0d4642b49480f49fc18b85cd Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 19 Oct 2021 14:00:51 +0200 Subject: chore(web/blog): Move out of //users/tazjin This will also be used for the TVL blog, with status updates of projects like Tvix. Note that while this commit evaluates, there are still some things specific to my blog in this code which I'll untangle in a future commit. Change-Id: If59431161b165d7249cbb856073a4cae84a1bfbf Reviewed-on: https://cl.tvl.fyi/c/depot/+/3732 Tested-by: BuildkiteCI Reviewed-by: grfn --- users/tazjin/blog/default.nix | 45 +++--------------- users/tazjin/blog/fragments.nix | 101 ---------------------------------------- 2 files changed, 6 insertions(+), 140 deletions(-) delete mode 100644 users/tazjin/blog/fragments.nix (limited to 'users/tazjin/blog') diff --git a/users/tazjin/blog/default.nix b/users/tazjin/blog/default.nix index a3c373a0fa76..fd2f38839a73 100644 --- a/users/tazjin/blog/default.nix +++ b/users/tazjin/blog/default.nix @@ -1,56 +1,23 @@ -# This creates the static files that make up my blog from the Markdown -# files in this repository. -# -# All blog posts are rendered from Markdown by cheddar. -{ depot, lib, pkgs, ... }@args: +{ depot, lib, pkgs, ... }: with depot.nix.yants; let - inherit (builtins) filter hasAttr map; + inherit (builtins) hasAttr filter; + inherit (depot.web.blog) post includePost renderPost; - # Type definition for a single blog post. - post = struct "blog-post" { - key = string; # - title = string; - date = int; - - # Optional time at which this post was last updated. - updated = option int; - - # Path to the Markdown file containing the post content. - content = path; - - # Should this post be included in the index? (defaults to true) - listed = option bool; - - # Is this a draft? (adds a banner indicating that the link should - # not be shared) - draft = option bool; - - # Previously each post title had a numeric ID. For these numeric - # IDs, redirects are generated so that old URLs stay compatible. - oldKey = option string; - }; - - posts = list post (import ./posts.nix); - fragments = import ./fragments.nix args; + posts = filter includePost (list post (import ./posts.nix)); rendered = pkgs.runCommandNoCC "tazjins-blog" {} '' mkdir -p $out ${lib.concatStringsSep "\n" (map (post: - "cp ${fragments.renderPost post} $out/${post.key}.html" + "cp ${renderPost post} $out/${post.key}.html" ) posts)} ''; - includePost = post: !(fragments.isDraft post) && !(fragments.isUnlisted post); in { - inherit post rendered; - static = ./static; - - # Only include listed posts - posts = filter includePost posts; + inherit posts rendered; # Generate embeddable nginx configuration for redirects from old post URLs oldRedirects = lib.concatStringsSep "\n" (map (post: '' diff --git a/users/tazjin/blog/fragments.nix b/users/tazjin/blog/fragments.nix deleted file mode 100644 index eb46a09fd044..000000000000 --- a/users/tazjin/blog/fragments.nix +++ /dev/null @@ -1,101 +0,0 @@ -# This file defines various fragments of the blog, such as the header -# and footer, as functions that receive arguments to be templated into -# them. -# -# An entire post is rendered by `renderPost`, which assembles the -# fragments together in a runCommand execution. -# -# The post index is generated by //users/tazjin/homepage, not by this -# code. -{ depot, lib, pkgs, ... }: - -let - inherit (builtins) filter map hasAttr replaceStrings; - inherit (pkgs) runCommandNoCC writeText; - inherit (depot.nix) renderMarkdown; - - # Generate a post list for all listed, non-draft posts. - isDraft = post: (hasAttr "draft" post) && post.draft; - isUnlisted = post: (hasAttr "listed" post) && !post.listed; - - escape = replaceStrings [ "<" ">" "&" "'" ] [ "<" ">" "&" "'" ]; - - header = title: '' - - - - - - - - - tazjin's blog: ${escape title} - - -

tazjin's interblag

- ''; - - footer = '' -

- - - ''; - - draftWarning = writeText "draft.html" '' -

- Note: This post is a draft! Please do not share - the link to it without asking me first. -

- ''; - - unlistedWarning = writeText "unlisted.html" '' -

- Note: This post is unlisted! Please do not share - the link to it without asking me first. -

- ''; - - renderPost = post: runCommandNoCC "${post.key}.html" {} '' - cat ${writeText "header.html" (header post.title)} > $out - - # Write the post title & date - echo '

${escape post.title}

' >> $out - echo '' >> $out - - ${ - # Add a warning to draft/unlisted posts to make it clear that - # people should not share the post. - - if (isDraft post) then "cat ${draftWarning} >> $out" - else if (isUnlisted post) then "cat ${unlistedWarning} >> $out" - else "# Your ads could be here?" - } - - # Write the actual post through cheddar's about-filter mechanism - cat ${renderMarkdown post.content} >> $out - echo '

' >> $out - - cat ${writeText "footer.html" footer} >> $out - ''; -in { - inherit renderPost isDraft isUnlisted; -} -- cgit 1.4.1