chore(web/blog): Move out of //users/tazjin r/2988

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 <grfn@gws.fyi>
author: Vincent Ambo <mail@tazj.in> 2021-10-19T12·00+0200
committer: tazjin <mail@tazj.in> 2021-10-22T09·56+0000
commit: 08d46ad293264a7c0d4642b49480f49fc18b85cd (patch)
tree: 0c76db0a8dd7e806fc19ee3bd20a4903a01dfb04 /users
parent: 33e71ba97fd3df598daa217ec36a48334136dcfc (diff)
4 files changed, 10 insertions, 144 deletions
diff --git a/users/tazjin/blog/default.nix b/users/tazjin/blog/default.nix
index a3c373a0fa..fd2f38839a 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 eb46a09fd0..0000000000
--- 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 [ "<" ">" "&" "'" ] [ "&lt;" "&gt;" "&amp;" "&#39;" ];
-
-  header = title: ''
-  <!DOCTYPE html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="tazjin&#39;s blog">
-    <link rel="stylesheet" type="text/css" href="/static/tvl.css" media="all">
-    <link rel="icon" type="image/webp" href="/static/favicon.webp">
-    <link rel="alternate" type="application/atom+xml" title="Atom Feed" href="/feed.atom">
-    <title>tazjin&#39;s blog: ${escape title}</title>
-  </head>
-  <body class="light">
-    <header>
-      <h1><a class="blog-title" href="/">tazjin&#39;s interblag</a> </h1>
-      <hr>
-    </header>
-  '';
-
-  footer = ''
-    <hr>
-    <footer>
-      <p class="footer">
-        <a class="uncoloured-link" href="https://tazj.in">homepage</a>
-        |
-        <a class="uncoloured-link" href="https://cs.tvl.fyi/">code</a>
-      </p>
-      <p class="lod">ಠ_ಠ</p>
-    </footer>
-  </body>
-  '';
-
-  draftWarning = writeText "draft.html" ''
-    <p class="cheddar-callout cheddar-warning">
-      <b>Note:</b> This post is a <b>draft</b>! Please do not share
-      the link to it without asking me first.
-    </p>
-    <hr>
-  '';
-
-  unlistedWarning = writeText "unlisted.html" ''
-    <p class="cheddar-callout cheddar-warning">
-      <b>Note:</b> This post is <b>unlisted</b>! Please do not share
-      the link to it without asking me first.
-    </p>
-    <hr>
-  '';
-
-  renderPost = post: runCommandNoCC "${post.key}.html" {} ''
-    cat ${writeText "header.html" (header post.title)} > $out
-
-    # Write the post title & date
-    echo '<article><h2 class="inline">${escape post.title}</h2>' >> $out
-    echo '<aside class="date">' >> $out
-    date --date="@${toString post.date}" '+%Y-%m-%d' >> $out
-    ${
-      if post ? updated
-      then ''date --date="@${toString post.updated}" '+ (updated %Y-%m-%d)' >> $out''
-      else ""
-    }
-    echo '</aside>' >> $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 '</article>' >> $out
-
-    cat ${writeText "footer.html" footer} >> $out
-  '';
-in {
-  inherit renderPost isDraft isUnlisted;
-}
diff --git a/users/tazjin/homepage/default.nix b/users/tazjin/homepage/default.nix
index a8ebe7e282..2ce1cf6322 100644
--- a/users/tazjin/homepage/default.nix
+++ b/users/tazjin/homepage/default.nix
@@ -28,7 +28,7 @@ let
 
   escape = replaceStrings [ "<" ">" "&" "'" ] [ "&lt;" "&gt;" "&amp;" "&#39;" ];
 
-  postToEntry = defun [ users.tazjin.blog.post entry ] (post: {
+  postToEntry = defun [ web.blog.post entry ] (post: {
     class = "blog";
     title = post.title;
     url = "/blog/${post.key}";
diff --git a/users/tazjin/homepage/feed.nix b/users/tazjin/homepage/feed.nix
index 985108ebe0..984b1c2950 100644
--- a/users/tazjin/homepage/feed.nix
+++ b/users/tazjin/homepage/feed.nix
@@ -8,8 +8,7 @@ let
   inherit (lib) max singleton;
   inherit (pkgs) writeText;
   inherit (depot.nix) renderMarkdown;
-  inherit (depot.users.tazjin) blog;
-  inherit (depot.web) atom-feed;
+  inherit (depot.web) blog atom-feed;
 
   postToEntry = defun [ blog.post atom-feed.entry ] (post: rec {
     id = "https://tazj.in/blog/${post.key}";
@@ -37,7 +36,8 @@ let
     };
   });
 
-  allEntries = (map postToEntry blog.posts) ++ (map pageEntryToEntry pageEntries);
+  allEntries = (map postToEntry depot.users.tazjin.blog.posts)
+             ++ (map pageEntryToEntry pageEntries);
 
   mostRecentlyUpdated = foldl' max 0 (map (e: e.updated) allEntries);
author	Vincent Ambo <mail@tazj.in>	2021-10-19T12·00+0200
committer	tazjin <mail@tazj.in>	2021-10-22T09·56+0000
commit	08d46ad293264a7c0d4642b49480f49fc18b85cd (patch)
tree	0c76db0a8dd7e806fc19ee3bd20a4903a01dfb04 /users
parent	33e71ba97fd3df598daa217ec36a48334136dcfc (diff)