From dc13e12b95fdc1e4458bc8ce95044da706acbaf6 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 10 Aug 2020 23:38:07 +0100 Subject: [PATCH] feat(tazjin/homepage): Add Atom feed for blog posts Change-Id: I9049e2cc3f5a2c491ccfad5595d60c01ad926e6d Reviewed-on: https://cl.tvl.fyi/c/depot/+/1712 Tested-by: BuildkiteCI Reviewed-by: tazjin --- users/tazjin/blog/fragments.nix | 2 +- users/tazjin/homepage/default.nix | 4 +++- users/tazjin/homepage/feed.nix | 40 +++++++++++++++++++++++++++++++ users/tazjin/homepage/header.html | 1 + 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 users/tazjin/homepage/feed.nix diff --git a/users/tazjin/blog/fragments.nix b/users/tazjin/blog/fragments.nix index 18f1c4e4c..4c1ed5d8a 100644 --- a/users/tazjin/blog/fragments.nix +++ b/users/tazjin/blog/fragments.nix @@ -28,7 +28,7 @@ let - + tazjin's blog: ${escape title} diff --git a/users/tazjin/homepage/default.nix b/users/tazjin/homepage/default.nix index 9ac3112b0..1b0044391 100644 --- a/users/tazjin/homepage/default.nix +++ b/users/tazjin/homepage/default.nix @@ -5,7 +5,7 @@ # elements for things such as blog posts and projects. # # Content for the blog is in //users/tazjin/blog instead of here. -{ depot, lib, ... }: +{ depot, lib, ... }@args: with depot; with nix.yants; @@ -65,8 +65,10 @@ let )); homepage = index ((map postToEntry users.tazjin.blog.posts) ++ (import ./entries.nix)); + atomFeed = import ./feed.nix args; in runCommandNoCC "website" {} '' mkdir $out cp ${homepage} $out/index.html + cp ${atomFeed} $out/feed.atom cp -r ${./static} $out/static '' diff --git a/users/tazjin/homepage/feed.nix b/users/tazjin/homepage/feed.nix new file mode 100644 index 000000000..1f9d7c91f --- /dev/null +++ b/users/tazjin/homepage/feed.nix @@ -0,0 +1,40 @@ +# Creates the Atom feed for my homepage. +{ depot, lib, pkgs, ... }: + +with depot.nix.yants; + +let + inherit (builtins) map readFile; + inherit (lib) singleton; + inherit (pkgs) writeText; + inherit (depot.users.tazjin) atom-feed blog renderMarkdown; + + postToEntry = defun [ blog.post atom-feed.entry ] (post: rec { + id = "https://tazj.in/blog/${post.key}"; + title = post.title; + content = readFile (renderMarkdown post.content); + published = post.date; + updated = post.date; # TODO(tazjin): this should be distinct from published + + links = singleton { + rel = "alternate"; + href = id; + }; + }); + + feed = { + id = "https://tazj.in/"; + title = "tazjin's interblag"; + # TODO(tazjin): Take the most recently updated entry time instead. + updated = builtins.currentTime; + rights = "© 2020 tazjin"; + authors = [ "tazjin" ]; + + links = singleton { + rel = "self"; + href = "https://tazjin/feed.atom"; + }; + + entries = map postToEntry blog.posts; + }; +in writeText "feed.atom" (atom-feed.renderFeed feed) diff --git a/users/tazjin/homepage/header.html b/users/tazjin/homepage/header.html index ec81fa04d..7cd106a49 100644 --- a/users/tazjin/homepage/header.html +++ b/users/tazjin/homepage/header.html @@ -4,6 +4,7 @@ + tazjin's interblag