diff options
Diffstat (limited to 'users')
| -rw-r--r-- | users/tazjin/blog/default.nix | 45 | ||||
| -rw-r--r-- | users/tazjin/blog/fragments.nix | 101 | ||||
| -rw-r--r-- | users/tazjin/homepage/default.nix | 2 | ||||
| -rw-r--r-- | users/tazjin/homepage/feed.nix | 6 |
4 files changed, 10 insertions, 144 deletions
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: '' - <!DOCTYPE html> - <head> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <meta name="description" content="tazjin'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's blog: ${escape title}</title> - </head> - <body class="light"> - <header> - <h1><a class="blog-title" href="/">tazjin'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 a8ebe7e28227..2ce1cf632255 100644 --- a/users/tazjin/homepage/default.nix +++ b/users/tazjin/homepage/default.nix @@ -28,7 +28,7 @@ let escape = replaceStrings [ "<" ">" "&" "'" ] [ "<" ">" "&" "'" ]; - 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 985108ebe091..984b1c295017 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); |